From 63502d3ac497715af3379a88b2270b04192881ea Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 25 Apr 2020 01:36:34 +0900 Subject: [PATCH] Fixed bug related to mapping logic when docking when minimized is disabled. Signed-off-by: Michele Calgaro --- src/tqtraylabel.cpp | 5 +++-- src/tqtraylabel.h | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/tqtraylabel.cpp b/src/tqtraylabel.cpp index 0b99f7e..4e0b717 100644 --- a/src/tqtraylabel.cpp +++ b/src/tqtraylabel.cpp @@ -356,10 +356,11 @@ void TQTrayLabel::map(void) SubstructureNotifyMask | SubstructureRedirectMask, l, sizeof(l)); // skipTaskbar modifies _NET_WM_STATE. Make sure we dont override WMs value TQTimer::singleShot(230, this, SLOT(skipTaskbar())); - // disable "dock when minized" for a short while since we went to Iconic state + // disable "dock when minized" (if enable) for a short while since we went to Iconic state // (when the window is mapped, often an IconicState WM_STATE message is sent too // just before the NormalState) - toggleDockWhenMinimized(); + mSavedDWM = mDockWhenMinimized->isChecked(); // store for later use + mDockWhenMinimized->setChecked(false); TQTimer::singleShot(500, this, SLOT(toggleDockWhenMinimized())); } diff --git a/src/tqtraylabel.h b/src/tqtraylabel.h index 462fc61..17a3fce 100644 --- a/src/tqtraylabel.h +++ b/src/tqtraylabel.h @@ -126,7 +126,7 @@ protected: private slots: void realityCheck(void); void showOnAllDesktops(void); - void toggleDockWhenMinimized(void) { mDockWhenMinimized->setChecked(!mDockWhenMinimized->isChecked()); } + void toggleDockWhenMinimized(void) { mDockWhenMinimized->setChecked(mSavedDWM); } void skipTaskbar(void); void setCustomIcon(void); void updateMenu(void); @@ -148,6 +148,7 @@ private: Window mDockedWindow; // the window which is being docked int mBalloonTimeout, mShowId; bool mDocked, mWithdrawn, mUndockWhenDead, mSessionManaged; + bool mSavedDWM; // related to dock when minimized logic TQString mTitle, mClass; // Title and hint of mDockedWindow TQPixmap mAppIcon; // The current app icon (may not be same as pixmap())