diff options
| author | Dana Jansens <danakj@orodu.net> | 2002-05-23 14:27:52 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2002-05-23 14:27:52 +0000 |
| commit | 67b4df1eff614c79bca956615a514bb5bb211af8 (patch) | |
| tree | 56f72fe3bed7251558ab8bff0961acb10cecffbc /src/openbox.cc | |
| parent | a25b213aff1ec7450b5d61c20cf3c8e0f918ee28 (diff) | |
merge the sticky window fix from 1.2.
Diffstat (limited to 'src/openbox.cc')
| -rw-r--r-- | src/openbox.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/openbox.cc b/src/openbox.cc index ab88729f..e71b269d 100644 --- a/src/openbox.cc +++ b/src/openbox.cc @@ -1088,7 +1088,10 @@ void Openbox::focusWindow(OpenboxWindow *win) { if (win && !win->isIconic()) { current_screen = win->getScreen(); tbar = current_screen->getToolbar(); - wkspc = current_screen->getWorkspace(win->getWorkspaceNumber()); + if (win->isStuck()) + wkspc = current_screen->getCurrentWorkspace(); + else + wkspc = current_screen->getWorkspace(win->getWorkspaceNumber()); win->setFocusFlag(true); wkspc->focusWindow(win); |