summaryrefslogtreecommitdiff
path: root/src/Window.cc
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2002-04-12 06:05:04 +0000
committerDana Jansens <danakj@orodu.net>2002-04-12 06:05:04 +0000
commit8d3c97389f23271c7b44a726111c97d34bc2ced2 (patch)
tree785933ad6c2ca8d754f62420d9dbdbf2744b4ddf /src/Window.cc
parente532e9576baa72559543aa1fa19852d38c1fe5e4 (diff)
save_rc() using the obResource class to save blackbox's configuration.
renamed BScreen::getCount to BScreen::getWorkspaceCount.
Diffstat (limited to 'src/Window.cc')
-rw-r--r--src/Window.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/Window.cc b/src/Window.cc
index 4133ac00..b81f1b90 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -284,7 +284,7 @@ OpenboxWindow::OpenboxWindow(Openbox *b, Window w, BScreen *s) {
decorate();
- if (workspace_number < 0 || workspace_number >= screen->getCount())
+ if (workspace_number < 0 || workspace_number >= screen->getWorkspaceCount())
screen->getCurrentWorkspace()->addWindow(this, place_window);
else
screen->getWorkspace(workspace_number)->addWindow(this, place_window);
@@ -1927,7 +1927,7 @@ void OpenboxWindow::restoreAttributes(void) {
}
if (((int) openbox_attrib.workspace != screen->getCurrentWorkspaceID()) &&
- ((int) openbox_attrib.workspace < screen->getCount())) {
+ ((int) openbox_attrib.workspace < screen->getWorkspaceCount())) {
screen->reassociateWindow(this, openbox_attrib.workspace, True);
if (current_state == NormalState) current_state = WithdrawnState;
@@ -2688,9 +2688,10 @@ void OpenboxWindow::buttonReleaseEvent(XButtonEvent *re) {
(re->x >= 0) && ((unsigned) re->x <= frame.button_w) &&
(re->y >= 0) && ((unsigned) re->y <= frame.button_h)) {
close();
- } else {
- redrawCloseButton(False);
}
+ //we should always redraw the close button. some applications
+ //eg. acroread don't honour the close.
+ redrawCloseButton(False);
}
// middle button released
} else if (re->button == 2) {