aboutsummaryrefslogtreecommitdiff
path: root/lumina-desktop
diff options
context:
space:
mode:
Diffstat (limited to 'lumina-desktop')
-rw-r--r--lumina-desktop/panel-plugins/taskmanager/LTaskButton.cpp6
-rw-r--r--lumina-desktop/panel-plugins/taskmanager/LTaskManagerPlugin.cpp3
2 files changed, 5 insertions, 4 deletions
diff --git a/lumina-desktop/panel-plugins/taskmanager/LTaskButton.cpp b/lumina-desktop/panel-plugins/taskmanager/LTaskButton.cpp
index 20607c60..eda1f2cd 100644
--- a/lumina-desktop/panel-plugins/taskmanager/LTaskButton.cpp
+++ b/lumina-desktop/panel-plugins/taskmanager/LTaskButton.cpp
@@ -193,9 +193,9 @@ void LTaskButton::minimizeWindow(){
void LTaskButton::triggerWindow(){
LWinInfo win = currentWindow();
//Check which state the window is currently in and flip it to the other
- LXCB::WINDOWSTATE state = cstate;
- if(DEBUG){ qDebug() << "Window State: " << state; }
- if(state == LXCB::ACTIVE){
+ //LXCB::WINDOWSTATE state = cstate;
+ //if(DEBUG){ qDebug() << "Window State: " << state; }
+ if(cstate == LXCB::ACTIVE){
if(DEBUG){ qDebug() << "Minimize Window:" << this->text(); }
LSession::handle()->XCB->MinimizeWindow(win.windowID());
QTimer::singleShot(100, this, SLOT(UpdateButton()) ); //make sure to update this button if losing active status
diff --git a/lumina-desktop/panel-plugins/taskmanager/LTaskManagerPlugin.cpp b/lumina-desktop/panel-plugins/taskmanager/LTaskManagerPlugin.cpp
index 8f73ffa1..9da86da8 100644
--- a/lumina-desktop/panel-plugins/taskmanager/LTaskManagerPlugin.cpp
+++ b/lumina-desktop/panel-plugins/taskmanager/LTaskManagerPlugin.cpp
@@ -35,7 +35,8 @@ void LTaskManagerPlugin::UpdateButtons(){
//Get the current window list
QList<WId> winlist = LSession::handle()->XCB->WindowList();
//Do not change the status of the previously active window if it just changed to a non-visible window
- bool skipActive = false;//!winlist.contains( LSession::handle()->XCB->ActiveWindow() );
+ WId activeWin = LSession::handle()->XCB->ActiveWindow();
+ bool skipActive = !winlist.contains(activeWin);
//qDebug() << "Update Buttons:" << winlist;
if(updating > ctime){ return; } //another thread kicked off already - stop this one
//Now go through all the current buttons first
bgstack15