diff options
Diffstat (limited to 'src/Window.cc')
-rw-r--r-- | src/Window.cc | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/Window.cc b/src/Window.cc index 74deb9b..9ec92c4 100644 --- a/src/Window.cc +++ b/src/Window.cc | |||
@@ -1389,7 +1389,7 @@ bool FluxboxWindow::focus() { | |||
1389 | // fetch the window to the current workspace | 1389 | // fetch the window to the current workspace |
1390 | if (model == BScreen::FETCH_ACTIVE_WINDOW || | 1390 | if (model == BScreen::FETCH_ACTIVE_WINDOW || |
1391 | (isIconic() && model == BScreen::SEMIFOLLOW_ACTIVE_WINDOW)) | 1391 | (isIconic() && model == BScreen::SEMIFOLLOW_ACTIVE_WINDOW)) |
1392 | screen().sendToWorkspace(screen().currentWorkspaceID(), this, true); | 1392 | screen().sendToWorkspace(screen().currentWorkspaceID(), this, false); |
1393 | // warp to the workspace of the window | 1393 | // warp to the workspace of the window |
1394 | else | 1394 | else |
1395 | screen().changeWorkspaceID(workspaceNumber()); | 1395 | screen().changeWorkspaceID(workspaceNumber()); |
@@ -1586,18 +1586,6 @@ void FluxboxWindow::deiconify(bool reassoc, bool do_raise) { | |||
1586 | raise(); | 1586 | raise(); |
1587 | } | 1587 | } |
1588 | 1588 | ||
1589 | /** | ||
1590 | Set window in withdrawn state | ||
1591 | */ | ||
1592 | void FluxboxWindow::withdraw(bool interrupt_moving) { | ||
1593 | #ifdef DEBUG | ||
1594 | cerr<<"FluxboxWindow::"<<__FUNCTION__<<": this = "<<this<<endl; | ||
1595 | #endif // DEBUG | ||
1596 | iconic = false; | ||
1597 | |||
1598 | hide(interrupt_moving); | ||
1599 | } | ||
1600 | |||
1601 | /** setFullscreen mode: | 1589 | /** setFullscreen mode: |
1602 | 1590 | ||
1603 | - maximize as big as the screen is, dont care about slit / toolbar | 1591 | - maximize as big as the screen is, dont care about slit / toolbar |
@@ -3901,7 +3889,7 @@ void FluxboxWindow::changeBlackboxHints(const BlackboxHints &net) { | |||
3901 | screen().reassociateWindow(this, net.workspace, true); | 3889 | screen().reassociateWindow(this, net.workspace, true); |
3902 | 3890 | ||
3903 | if (screen().currentWorkspaceID() != net.workspace) | 3891 | if (screen().currentWorkspaceID() != net.workspace) |
3904 | withdraw(true); | 3892 | hide(true); |
3905 | else | 3893 | else |
3906 | deiconify(); | 3894 | deiconify(); |
3907 | } | 3895 | } |