aboutsummaryrefslogtreecommitdiff
path: root/src/Toolbar.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Toolbar.cc')
-rw-r--r--src/Toolbar.cc23
1 files changed, 11 insertions, 12 deletions
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index d35e872..19e85db 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.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: Toolbar.cc,v 1.153 2004/09/11 13:33:07 fluxgen Exp $ 25// $Id: Toolbar.cc,v 1.154 2004/09/11 13:34:01 fluxgen Exp $
26 26
27#include "Toolbar.hh" 27#include "Toolbar.hh"
28 28
@@ -488,17 +488,16 @@ void Toolbar::buttonPressEvent(XButtonEvent &be) {
488 488
489 int head = screen().getHead(be.x_root, be.y_root); 489 int head = screen().getHead(be.x_root, be.y_root);
490 int borderw = menu().fbwindow().borderWidth(); 490 int borderw = menu().fbwindow().borderWidth();
491 pair<int, int> m = screen().clampToHead( head, 491 pair<int, int> m = screen().clampToHead(head,
492 be.x_root - (menu().width() / 2), 492 be.x_root - (menu().width() / 2),
493 be.y_root - (menu().titleWindow().height() / 2), 493 be.y_root - (menu().titleWindow().height() / 2),
494 menu().width() + 2*borderw, 494 menu().width() + 2*borderw,
495 menu().height() + 2*borderw); 495 menu().height() + 2*borderw);
496 496
497 menu().setScreen( 497 menu().setScreen(screen().getHeadX(head),
498 screen().getHeadX(head), 498 screen().getHeadY(head),
499 screen().getHeadY(head), 499 screen().getHeadWidth(head),
500 screen().getHeadWidth(head), 500 screen().getHeadHeight(head));
501 screen().getHeadHeight(head));
502 menu().move(m.first, m.second); 501 menu().move(m.first, m.second);
503 menu().show(); 502 menu().show();
504 menu().grabInputFocus(); 503 menu().grabInputFocus();