diff options
Diffstat (limited to 'src/IconButton.cc')
-rw-r--r-- | src/IconButton.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/IconButton.cc b/src/IconButton.cc index 11b2c02..b9cf523 100644 --- a/src/IconButton.cc +++ b/src/IconButton.cc | |||
@@ -77,21 +77,21 @@ public: | |||
77 | // if the workspace is changed. | 77 | // if the workspace is changed. |
78 | FluxboxWindow &win = m_win; | 78 | FluxboxWindow &win = m_win; |
79 | if(win.isIconic() || !win.isFocused()) { | 79 | if(win.isIconic() || !win.isFocused()) { |
80 | switch(m_tool.deiconifyMode()) { | 80 | switch(win.screen().getUserFollowModel()) { |
81 | case IconbarTool::SEMIFOLLOW: | 81 | case BScreen::SEMIFOLLOW_ACTIVE_WINDOW: |
82 | if (win.isIconic()) { | 82 | if (win.isIconic()) { |
83 | win.screen().sendToWorkspace(win.screen().currentWorkspaceID(), &win); | 83 | win.screen().sendToWorkspace(win.screen().currentWorkspaceID(), &win); |
84 | } else { | 84 | } else { |
85 | win.screen().changeWorkspaceID(win.workspaceNumber()); | 85 | win.screen().changeWorkspaceID(win.workspaceNumber()); |
86 | } | 86 | } |
87 | break; | 87 | break; |
88 | case IconbarTool::CURRENT: | 88 | case BScreen::FETCH_ACTIVE_WINDOW: |
89 | win.screen().sendToWorkspace(win.screen().currentWorkspaceID(), &win); | 89 | win.screen().sendToWorkspace(win.screen().currentWorkspaceID(), &win); |
90 | break; | 90 | break; |
91 | case IconbarTool::FOLLOW: | 91 | case BScreen::FOLLOW_ACTIVE_WINDOW: |
92 | default: | ||
93 | if (!win.isStuck()) | 92 | if (!win.isStuck()) |
94 | win.screen().changeWorkspaceID(win.workspaceNumber()); | 93 | win.screen().changeWorkspaceID(win.workspaceNumber()); |
94 | default: | ||
95 | break; | 95 | break; |
96 | }; | 96 | }; |
97 | win.raiseAndFocus(); | 97 | win.raiseAndFocus(); |