aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsimonb <simonb>2006-03-27 06:35:51 (GMT)
committersimonb <simonb>2006-03-27 06:35:51 (GMT)
commit6d35c17ac0635f7e9c5bc1eec5e079c58bdbd171 (patch)
tree1917a3bb2050a80e0bbe9c4b2daedeec37daf812
parent309a1aafb36ba4c90d9cf4d0c635aed919fb5aa2 (diff)
downloadfluxbox_pavel-6d35c17ac0635f7e9c5bc1eec5e079c58bdbd171.zip
fluxbox_pavel-6d35c17ac0635f7e9c5bc1eec5e079c58bdbd171.tar.bz2
don't follow stuck windows in deiconify (thanks _markt)
-rw-r--r--ChangeLog3
-rw-r--r--src/IconButton.cc3
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7d4d209..e3c30e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@ Changes for 0.9.16:
3*06/03/27: 3*06/03/27:
4 * Fix crash when deiconifying stuck windows with Follow mode (Simon) 4 * Fix crash when deiconifying stuck windows with Follow mode (Simon)
5 IconButton.cc 5 IconButton.cc
6 * Don't Follow stuck windows on deiconify, since they're stuck
7 (thanks _markt)
8 IconButton.cc
6*06/03/26: 9*06/03/26:
7 * Related to external (Simon) 10 * Related to external (Simon)
8 - Fix title alignment 11 - Fix title alignment
diff --git a/src/IconButton.cc b/src/IconButton.cc
index edc2fc1..770944f 100644
--- a/src/IconButton.cc
+++ b/src/IconButton.cc
@@ -91,7 +91,8 @@ public:
91 break; 91 break;
92 case IconbarTool::FOLLOW: 92 case IconbarTool::FOLLOW:
93 default: 93 default:
94 win.screen().changeWorkspaceID(win.workspaceNumber()); 94 if (!win.isStuck())
95 win.screen().changeWorkspaceID(win.workspaceNumber());
95 break; 96 break;
96 }; 97 };
97 win.raiseAndFocus(); 98 win.raiseAndFocus();