diff options
author | fluxgen <fluxgen> | 2002-04-09 23:20:40 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2002-04-09 23:20:40 (GMT) |
commit | 46e9b6e5462af0a05808c4d636526c04067a3623 (patch) | |
tree | bfd9ac1028247c732af84291e56a20391d8641ac /src/Window.cc | |
parent | bd7951bcdad7e1c4dd6b5ff267cb85fc8cbf6d7e (diff) | |
download | fluxbox-46e9b6e5462af0a05808c4d636526c04067a3623.zip fluxbox-46e9b6e5462af0a05808c4d636526c04067a3623.tar.bz2 |
update from Workspace changes
Diffstat (limited to 'src/Window.cc')
-rw-r--r-- | src/Window.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Window.cc b/src/Window.cc index 80edb86..260fa7c 100644 --- a/src/Window.cc +++ b/src/Window.cc | |||
@@ -22,7 +22,7 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: Window.cc,v 1.41 2002/04/08 22:32:07 fluxgen Exp $ | 25 | // $Id: Window.cc,v 1.42 2002/04/09 23:17:11 fluxgen Exp $ |
26 | 26 | ||
27 | #include "Window.hh" | 27 | #include "Window.hh" |
28 | 28 | ||
@@ -1952,8 +1952,8 @@ void FluxboxWindow::iconify(void) { | |||
1952 | 1952 | ||
1953 | void FluxboxWindow::deiconify(bool reassoc, bool raise) { | 1953 | void FluxboxWindow::deiconify(bool reassoc, bool raise) { |
1954 | if (iconic || reassoc) { | 1954 | if (iconic || reassoc) { |
1955 | screen->reassociateWindow(this, screen->getCurrentWorkspace()->getWorkspaceID(), false); | 1955 | screen->reassociateWindow(this, screen->getCurrentWorkspace()->workspaceID(), false); |
1956 | } else if (workspace_number != screen->getCurrentWorkspace()->getWorkspaceID()) | 1956 | } else if (workspace_number != screen->getCurrentWorkspace()->workspaceID()) |
1957 | return; | 1957 | return; |
1958 | 1958 | ||
1959 | setState(NormalState); | 1959 | setState(NormalState); |
@@ -2376,7 +2376,7 @@ void FluxboxWindow::stick(void) { | |||
2376 | stuck = false; | 2376 | stuck = false; |
2377 | 2377 | ||
2378 | if (! iconic) | 2378 | if (! iconic) |
2379 | screen->reassociateWindow(this, screen->getCurrentWorkspace()->getWorkspaceID(), true); | 2379 | screen->reassociateWindow(this, screen->getCurrentWorkspace()->workspaceID(), true); |
2380 | 2380 | ||
2381 | 2381 | ||
2382 | } else { | 2382 | } else { |