diff options
Diffstat (limited to 'src/Screen.cc')
-rw-r--r-- | src/Screen.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Screen.cc b/src/Screen.cc index a53792b..1557409 100644 --- a/src/Screen.cc +++ b/src/Screen.cc | |||
@@ -1185,7 +1185,7 @@ int BScreen::removeLastWorkspace() { | |||
1185 | } | 1185 | } |
1186 | 1186 | ||
1187 | 1187 | ||
1188 | void BScreen::changeWorkspaceID(unsigned int id) { | 1188 | void BScreen::changeWorkspaceID(unsigned int id, bool revert) { |
1189 | 1189 | ||
1190 | if (! m_current_workspace || id >= m_workspaces_list.size() || | 1190 | if (! m_current_workspace || id >= m_workspaces_list.size() || |
1191 | id == m_current_workspace->workspaceID()) | 1191 | id == m_current_workspace->workspaceID()) |
@@ -1228,7 +1228,7 @@ void BScreen::changeWorkspaceID(unsigned int id) { | |||
1228 | if (focused && focused->isMoving()) { | 1228 | if (focused && focused->isMoving()) { |
1229 | focused->focus(); | 1229 | focused->focus(); |
1230 | focused->resumeMoving(); | 1230 | focused->resumeMoving(); |
1231 | } else | 1231 | } else if (revert) |
1232 | FocusControl::revertFocus(*this); | 1232 | FocusControl::revertFocus(*this); |
1233 | 1233 | ||
1234 | old->hideAll(false); | 1234 | old->hideAll(false); |
@@ -1257,7 +1257,7 @@ void BScreen::sendToWorkspace(unsigned int id, FluxboxWindow *win, bool changeWS | |||
1257 | 1257 | ||
1258 | // change workspace ? | 1258 | // change workspace ? |
1259 | if (changeWS) | 1259 | if (changeWS) |
1260 | changeWorkspaceID(id); | 1260 | changeWorkspaceID(id, false); |
1261 | 1261 | ||
1262 | // if the window is on current workspace, show it; else hide it. | 1262 | // if the window is on current workspace, show it; else hide it. |
1263 | if (id == currentWorkspace()->workspaceID() && !win->isIconic()) | 1263 | if (id == currentWorkspace()->workspaceID() && !win->isIconic()) |