nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

check if window is stuck when using followmodel

Browse source
This commit is contained in:
markt 2006-08-03 02:33:07 +00:00
parent 00d862724a
commit 59f150d5db
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Ewmh.cc
View file

@ -773,7 +773,8 @@ bool Ewmh::checkClientMessage(const XClientMessageEvent &ce,
// if the raised window is on a different workspace // if the raised window is on a different workspace
// we do what the user wish: // we do what the user wish:
// either ignore|go to that workspace|get the window // either ignore|go to that workspace|get the window
if (fbwin->screen().currentWorkspaceID() != fbwin->workspaceNumber()) { if (fbwin->screen().currentWorkspaceID() != fbwin->workspaceNumber()
&& !fbwin->isStuck()) {
BScreen::FollowModel model = (ce.data.l[0] == 2) ? BScreen::FollowModel model = (ce.data.l[0] == 2) ?
fbwin->screen().getUserFollowModel() : fbwin->screen().getUserFollowModel() :
fbwin->screen().getFollowModel(); fbwin->screen().getFollowModel();

3
src/Workspace.cc
View file

@ -104,7 +104,8 @@ public:
return; return;
FluxboxWindow &win = *m_client.fbwindow(); FluxboxWindow &win = *m_client.fbwindow();
if (win.screen().currentWorkspaceID() != win.workspaceNumber()) { if (win.screen().currentWorkspaceID() != win.workspaceNumber() &&
!win.isStuck()) {
win.menu().hide(); win.menu().hide();
BScreen::FollowModel model = win.screen().getUserFollowModel(); BScreen::FollowModel model = win.screen().getUserFollowModel();
if (model == BScreen::IGNORE_OTHER_WORKSPACES) if (model == BScreen::IGNORE_OTHER_WORKSPACES)