check if window is stuck when using followmodel
This commit is contained in:
parent
00d862724a
commit
59f150d5db
2 changed files with 4 additions and 2 deletions
|
@ -773,7 +773,8 @@ bool Ewmh::checkClientMessage(const XClientMessageEvent &ce,
|
|||
// if the raised window is on a different workspace
|
||||
// we do what the user wish:
|
||||
// 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) ?
|
||||
fbwin->screen().getUserFollowModel() :
|
||||
fbwin->screen().getFollowModel();
|
||||
|
|
|
@ -104,7 +104,8 @@ public:
|
|||
return;
|
||||
FluxboxWindow &win = *m_client.fbwindow();
|
||||
|
||||
if (win.screen().currentWorkspaceID() != win.workspaceNumber()) {
|
||||
if (win.screen().currentWorkspaceID() != win.workspaceNumber() &&
|
||||
!win.isStuck()) {
|
||||
win.menu().hide();
|
||||
BScreen::FollowModel model = win.screen().getUserFollowModel();
|
||||
if (model == BScreen::IGNORE_OTHER_WORKSPACES)
|
||||
|
|
Loading…
Reference in a new issue