aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormarkt <markt>2006-08-03 02:33:07 (GMT)
committermarkt <markt>2006-08-03 02:33:07 (GMT)
commit59f150d5db2bbdaa9f42ce73b2d8095ea8b3923f (patch)
treec58a9c75498aca3768d3ccf02b70e7faca576074 /src
parent00d862724a5dae43dbf1cbe4378fb846218fb3c3 (diff)
downloadfluxbox-59f150d5db2bbdaa9f42ce73b2d8095ea8b3923f.zip
fluxbox-59f150d5db2bbdaa9f42ce73b2d8095ea8b3923f.tar.bz2
check if window is stuck when using followmodel
Diffstat (limited to 'src')
-rw-r--r--src/Ewmh.cc3
-rw-r--r--src/Workspace.cc3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/Ewmh.cc b/src/Ewmh.cc
index 96ba209..97c66b8 100644
--- a/src/Ewmh.cc
+++ b/src/Ewmh.cc
@@ -773,7 +773,8 @@ bool Ewmh::checkClientMessage(const XClientMessageEvent &ce,
773 // if the raised window is on a different workspace 773 // if the raised window is on a different workspace
774 // we do what the user wish: 774 // we do what the user wish:
775 // either ignore|go to that workspace|get the window 775 // either ignore|go to that workspace|get the window
776 if (fbwin->screen().currentWorkspaceID() != fbwin->workspaceNumber()) { 776 if (fbwin->screen().currentWorkspaceID() != fbwin->workspaceNumber()
777 && !fbwin->isStuck()) {
777 BScreen::FollowModel model = (ce.data.l[0] == 2) ? 778 BScreen::FollowModel model = (ce.data.l[0] == 2) ?
778 fbwin->screen().getUserFollowModel() : 779 fbwin->screen().getUserFollowModel() :
779 fbwin->screen().getFollowModel(); 780 fbwin->screen().getFollowModel();
diff --git a/src/Workspace.cc b/src/Workspace.cc
index 2ee2768..83db8ef 100644
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -104,7 +104,8 @@ public:
104 return; 104 return;
105 FluxboxWindow &win = *m_client.fbwindow(); 105 FluxboxWindow &win = *m_client.fbwindow();
106 106
107 if (win.screen().currentWorkspaceID() != win.workspaceNumber()) { 107 if (win.screen().currentWorkspaceID() != win.workspaceNumber() &&
108 !win.isStuck()) {
108 win.menu().hide(); 109 win.menu().hide();
109 BScreen::FollowModel model = win.screen().getUserFollowModel(); 110 BScreen::FollowModel model = win.screen().getUserFollowModel();
110 if (model == BScreen::IGNORE_OTHER_WORKSPACES) 111 if (model == BScreen::IGNORE_OTHER_WORKSPACES)