aboutsummaryrefslogtreecommitdiff
path: root/src
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 /src
parentb0076fb3b4e49b07f3fdca6004630d52a8a2ab50 (diff)
downloadfluxbox_paul-efe4ead2144469efc567966304c842fabcc7856e.zip
fluxbox_paul-efe4ead2144469efc567966304c842fabcc7856e.tar.bz2
fixed #960535, Deiconify with apps set 'sticky'
Diffstat (limited to 'src')
-rw-r--r--src/FbCommands.cc6
1 files changed, 4 insertions, 2 deletions
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);