X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2FWindow.cc;h=3a9821157ea585643672cd379cfd3beb729c469f;hb=72a2e98738d87b89620bafd15141690aa4be8fab;hp=3005674b900bdac5cb62585b5a84ccb2d0dec629;hpb=e0d619e309a7fe6de1524b2574ecc9d77aee5a35;p=chaz%2Fopenbox

diff --git a/src/Window.cc b/src/Window.cc
index 3005674b..3a982115 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -40,7 +40,7 @@ extern "C" {
 #endif // DEBUG
 
 #ifdef HAVE_STDLIB_H
-   #include <stdlib.h>
+#  include <stdlib.h>
 #endif // HAVE_STDLIB_H
 }
 
@@ -3173,13 +3173,19 @@ void BlackboxWindow::buttonPressEvent(const XButtonEvent *be) {
 
       if (mx < left_edge)
         mx = left_edge;
-      if (mx > right_edge)
+      else if (mx > right_edge)
         mx = right_edge;
       if (my < top_edge)
         my = top_edge;
-      if (my > bottom_edge)
+      else if (my > bottom_edge)
         my = bottom_edge;
+      
+      if (my + windowmenu->getHeight() > screen->getHeight())
+        my = screen->getHeight() - windowmenu->getHeight() -
+          (screen->getBorderWidth() * 2);
+
 
+      cout << my << endl;
       windowmenu->move(mx, my);
       windowmenu->show();
       XRaiseWindow(blackbox->getXDisplay(), windowmenu->getWindowID());