LXQtPanel: workaround KAcceleratorManager changing button text FIXME …

…TODO TODO: is this correct approach?
lxqt · Jul 12, 2024 · 89cc494 · 89cc494
1 parent 3985797
commit 89cc494
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 4 deletions.
diff --git a/plugin-taskbar/lxqttaskbutton.cpp b/plugin-taskbar/lxqttaskbutton.cpp
@@ -128,7 +128,7 @@ LXQtTaskButton::~LXQtTaskButton() = default;
 void LXQtTaskButton::updateText()
 {
     QString title = mBackend->getWindowTitle(mWindow);
-    setText(title.replace(QStringLiteral("&"), QStringLiteral("&&")));
+    setTextExplicitly(title.replace(QStringLiteral("&"), QStringLiteral("&&")));
     setToolTip(title);
 }
 
@@ -314,6 +314,30 @@ QMimeData * LXQtTaskButton::mimeData()
     return mimedata;
 }
 
+/*!
+ * \brief LXQtTaskButton::setTextExplicitly
+ * \param str
+ *
+ * This is needed to workaround flickering caused by KAcceleratorManager
+ * This class is hooked by KDE Integration and adds accelerators to button text
+ * (Adds some '&' characters)
+ * This triggers widget update but soon after text is reset to original value
+ * This triggers a KAcceleratorManager update which again adds accelerator
+ * This happens in loop
+ *
+ * TODO: investigate proper solution
+ */
+void LXQtTaskButton::setTextExplicitly(const QString &str)
+{
+    if(str == mExplicitlySetText)
+    {
+        return;
+    }
+
+    mExplicitlySetText = str;
+    setText(mExplicitlySetText);
+}
+
 /************************************************
 
  ************************************************/
@@ -688,6 +712,7 @@ void LXQtTaskButton::contextMenuEvent(QContextMenuEvent* event)
     menu->addSeparator();
     a = menu->addAction(XdgIcon::fromTheme(QStringLiteral("process-stop")), tr("&Close"));
     connect(a, &QAction::triggered, this, &LXQtTaskButton::closeApplication);
+
     menu->setGeometry(mParentTaskBar->panel()->calculatePopupWindowPos(mapToGlobal(event->pos()), menu->sizeHint()));
     mPlugin->willShowWindow(menu);
     menu->show();

diff --git a/plugin-taskbar/lxqttaskbutton.h b/plugin-taskbar/lxqttaskbutton.h
@@ -122,6 +122,8 @@ public slots:
 
     inline ILXQtPanelPlugin * plugin() const { return mPlugin; }
 
+    void setTextExplicitly(const QString& str);
+
 protected:
     //TODO: public getter instead?
     ILXQtAbstractWMInterface *mBackend;
@@ -138,6 +140,8 @@ public slots:
     int mIconSize;
     int mWheelDelta;
 
+    QString mExplicitlySetText;
+
     // Timer for when draggind something into a button (the button's window
     // must be activated so that the use can continue dragging to the window
     QTimer * mDNDTimer;

diff --git a/plugin-taskbar/lxqttaskgroup.cpp b/plugin-taskbar/lxqttaskgroup.cpp
@@ -57,7 +57,7 @@ LXQtTaskGroup::LXQtTaskGroup(const QString &groupName, WId window, LXQtTaskBar *
     Q_ASSERT(parent);
 
     setObjectName(groupName);
-    setText(groupName);
+    setTextExplicitly(groupName);
 
     connect(this,   &LXQtTaskGroup::clicked,                           this, &LXQtTaskGroup::onClicked);
     connect(parent, &LXQtTaskBar::buttonRotationRefreshed,             this, &LXQtTaskGroup::setAutoRotation);
@@ -336,7 +336,7 @@ void LXQtTaskGroup::regroup()
 
         if (button)
         {
-            setText(button->text());
+            setTextExplicitly(button->text());
             setToolTip(button->toolTip());
             setWindowId(button->windowId());
         }
@@ -347,7 +347,7 @@ void LXQtTaskGroup::regroup()
     {
         mSingleButton = false;
         QString t = QString(QStringLiteral("%1 - %2 windows")).arg(mGroupName).arg(cont);
-        setText(t);
+        setTextExplicitly(t);
         setToolTip(parentTaskBar()->isShowGroupOnHover() ? QString() : t);
     }
 }