Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-23 18:32:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

plasma: check popup status on Plasma::Applet::activate() signal

Browse source 
not always emitted by Plasma::PopupAppletPrivate::internalTogglePopup() tho

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2023-10-22 07:00:17 +03:00
parent 12fd5b63e7
commit ac329a2b24
2 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
plasma/applets/systemtray/systemtray.cpp
View file

@ -25,8 +25,6 @@
// standard issue margin/spacing
static const int s_margin = 4;
static const int s_spacing = 2;
// there is no signal for when the popup is shown so it has to be checked on timer
static const int s_popuptimeout = 500;
static QString kElementForArrow(const Qt::Orientation orientation, const bool reverse)
{
@ -58,19 +56,11 @@ SystemTrayApplet::SystemTrayApplet(QObject *parent, const QVariantList &args)
: Plasma::Applet(parent, args),
m_layout(nullptr),
m_arrowicon(nullptr),
m_showinghidden(false),
m_popuptimer(nullptr)
m_showinghidden(false)
{
KGlobal::locale()->insertCatalog("plasma_applet_systemtray");
setAspectRatioMode(Plasma::AspectRatioMode::IgnoreAspectRatio);
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
m_popuptimer = new QTimer(this);
m_popuptimer->setInterval(s_popuptimeout);
connect(
m_popuptimer, SIGNAL(timeout()),
this, SLOT(slotUpdateVisibility())
);
}
SystemTrayApplet::~SystemTrayApplet()
@ -148,7 +138,6 @@ void SystemTrayApplet::constraintsEvent(Plasma::Constraints constraints)
void SystemTrayApplet::slotUpdateLayout()
{
m_popuptimer->stop();
QMutexLocker locker(&m_mutex);
foreach (Plasma::Applet* plasmaapplet, m_applets) {
disconnect(plasmaapplet, 0, this, 0);
@ -191,6 +180,10 @@ void SystemTrayApplet::slotUpdateLayout()
plasmaapplet, SIGNAL(appletDestroyed(Plasma::Applet*)),
this, SLOT(slotUpdateLayout())
);
connect(
plasmaapplet, SIGNAL(activate()),
this, SLOT(slotUpdateVisibility())
);
connect(
plasmaapplet, SIGNAL(newStatus(Plasma::ItemStatus)),
this, SLOT(slotUpdateVisibility())
@ -201,7 +194,6 @@ void SystemTrayApplet::slotUpdateLayout()
}
locker.unlock();
slotUpdateVisibility();
m_popuptimer->start();
}
void SystemTrayApplet::slotUpdateVisibility()

2
plasma/applets/systemtray/systemtray.h
View file

@ -20,7 +20,6 @@
#define SYSTEMTRAY_H
#include <QMutex>
#include <QTimer>
#include <QGraphicsLinearLayout>
#include <Plasma/Applet>
#include <Plasma/IconWidget>
@ -52,7 +51,6 @@ private:
QList<Plasma::Applet*> m_applets;
Plasma::IconWidget* m_arrowicon;
bool m_showinghidden;
QTimer* m_popuptimer;
};
#endif // SYSTEMTRAY_H