space.setH(space.h() - tbarh);
}
#else // !SLIT
- int tbarh = resource.hide_toolbar() ? 0 :
+ int tbarh = resource.hide_toolbar ? 0 :
toolbar->getExposedHeight() + resource.border_width * 2;
switch (toolbar->placement()) {
case Toolbar::TopLeft:
workspacemenu->setItemSelected(current_workspace->getWorkspaceID() + 2,
False);
- if (openbox.focusedWindow() &&
- openbox.focusedWindow()->getScreen() == this &&
- (! openbox.focusedWindow()->isStuck())) {
- openbox.focusWindow(0);
- }
+ OpenboxWindow *fw = openbox.focusedWindow();
+ if (fw && fw->getScreen() == this)
+ openbox.focusWindow(0);
current_workspace = getWorkspace(id);