diff options
| author | Ken Moore <ken@pcbsd.org> | 2015-04-25 13:59:12 -0400 |
|---|---|---|
| committer | Ken Moore <ken@pcbsd.org> | 2015-04-25 13:59:12 -0400 |
| commit | 9f6cd8d22100543db9592f2741fb1eca3523f764 (patch) | |
| tree | 1cbcb268316b8da61f61d32ba5d2c9def3a2389f /lumina-desktop | |
| parent | Add the new panel length/alignment options to lumina-config (diff) | |
| download | lumina-9f6cd8d22100543db9592f2741fb1eca3523f764.tar.gz lumina-9f6cd8d22100543db9592f2741fb1eca3523f764.tar.bz2 lumina-9f6cd8d22100543db9592f2741fb1eca3523f764.zip | |
Fix another bug with the new panel/window activation switcher: do *not* re-activate the original window if a new window was activated in the meantime (such as when activating a window with the task manager).
Diffstat (limited to 'lumina-desktop')
| -rw-r--r-- | lumina-desktop/LPanel.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lumina-desktop/LPanel.cpp b/lumina-desktop/LPanel.cpp index c899ff16..a3b0fc43 100644 --- a/lumina-desktop/LPanel.cpp +++ b/lumina-desktop/LPanel.cpp @@ -335,7 +335,8 @@ void LPanel::leaveEvent(QEvent *event){ if( !this->geometry().contains(QCursor::pos()) ){ //Move the panel back to it's "hiding" spot if(hidden){ this->move(hidepoint); } - if(tmpID!=0){ LSession::handle()->XCB->ActivateWindow(tmpID); } + //Only re-activate the old window if the panel is still currently active + if(tmpID!=0 && (this->winId()==LSession::handle()->XCB->ActiveWindow()) ){ LSession::handle()->XCB->ActivateWindow(tmpID); } tmpID = 0; } |