aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormathias <mathias>2005-04-23 08:44:45 (GMT)
committermathias <mathias>2005-04-23 08:44:45 (GMT)
commitefe4ead2144469efc567966304c842fabcc7856e (patch)
tree217d31cdc120ee87b3172023ae903fad8c8428f1
parentb0076fb3b4e49b07f3fdca6004630d52a8a2ab50 (diff)
downloadfluxbox_pavel-efe4ead2144469efc567966304c842fabcc7856e.zip
fluxbox_pavel-efe4ead2144469efc567966304c842fabcc7856e.tar.bz2
fixed #960535, Deiconify with apps set 'sticky'
-rw-r--r--ChangeLog4
-rw-r--r--src/FbCommands.cc6
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 194ae98..ec2e7ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,9 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.13 2Changes for 0.9.13
3*05/04/23: 3*05/04/23:
4 * Fixed #1020399 aka broken ShowDesktop - command (mathias) 4 * Fixed #960535 aka Deiconify with apps set 'sticky' (Mathias)
5 FbCommands.cc
6 * Fixed #1020399 aka broken ShowDesktop - command (Mathias)
5 WorkspaceCmd.cc 7 WorkspaceCmd.cc
6*05/04/22: 8*05/04/22:
7 * clear maximized-Flags of a resized/moved Window (Mathias) 9 * clear maximized-Flags of a resized/moved Window (Mathias)
diff --git a/src/FbCommands.cc b/src/FbCommands.cc
index 9b20071..1dbbd66 100644
--- a/src/FbCommands.cc
+++ b/src/FbCommands.cc
@@ -313,7 +313,8 @@ void DeiconifyCmd::execute() {
313 case ALLWORKSPACE: 313 case ALLWORKSPACE:
314 for(; it != itend; it++) { 314 for(; it != itend; it++) {
315 old_workspace_num= (*it)->workspaceNumber(); 315 old_workspace_num= (*it)->workspaceNumber();
316 if (m_mode == ALL || old_workspace_num == workspace_num) { 316 if (m_mode == ALL || old_workspace_num == workspace_num ||
317 (*it)->isStuck()) {
317 if (m_dest == ORIGIN || m_dest == ORIGINQUIET) 318 if (m_dest == ORIGIN || m_dest == ORIGINQUIET)
318 screen->sendToWorkspace(old_workspace_num, (*it), change_ws); 319 screen->sendToWorkspace(old_workspace_num, (*it), change_ws);
319 else 320 else
@@ -327,7 +328,8 @@ void DeiconifyCmd::execute() {
327 default: 328 default:
328 for (; it != itend; it++) { 329 for (; it != itend; it++) {
329 old_workspace_num= (*it)->workspaceNumber(); 330 old_workspace_num= (*it)->workspaceNumber();
330 if(m_mode == LAST || old_workspace_num == workspace_num) { 331 if(m_mode == LAST || old_workspace_num == workspace_num ||
332 (*it)->isStuck()) {
331 if ((m_dest == ORIGIN || m_dest == ORIGINQUIET) && 333 if ((m_dest == ORIGIN || m_dest == ORIGINQUIET) &&
332 m_mode != LASTWORKSPACE) 334 m_mode != LASTWORKSPACE)
333 screen->sendToWorkspace(old_workspace_num, (*it), change_ws); 335 screen->sendToWorkspace(old_workspace_num, (*it), change_ws);