From cb8e8e8d054b044db602326278055dc10f1c0c57 Mon Sep 17 00:00:00 2001
From: fluxgen <fluxgen>
Date: Wed, 10 Dec 2003 22:28:07 +0000
Subject: fixed geometry bug

---
 src/Screen.cc |  8 +++++++-
 src/Window.cc | 12 +++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/Screen.cc b/src/Screen.cc
index 7ac60d6..25d91ed 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Screen.cc,v 1.245 2003/12/07 16:39:43 fluxgen Exp $
+// $Id: Screen.cc,v 1.246 2003/12/10 22:28:07 fluxgen Exp $
 
 
 #include "Screen.hh"
@@ -2016,6 +2016,9 @@ void BScreen::shutdown() {
 
 
 void BScreen::showPosition(int x, int y) {
+    if (!doShowWindowPos())
+        return;
+
     if (! geom_visible) {
         if (hasXinerama()) {
             unsigned int head = getCurrHead();
@@ -2052,6 +2055,9 @@ void BScreen::showPosition(int x, int y) {
 
 
 void BScreen::showGeometry(unsigned int gx, unsigned int gy) {
+    if (!doShowWindowPos())
+        return;
+
     if (! geom_visible) {
         if (hasXinerama()) {
             unsigned int head = getCurrHead();
diff --git a/src/Window.cc b/src/Window.cc
index 0ffaca6..aa2af04 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Window.cc,v 1.248 2003/12/07 17:47:42 fluxgen Exp $
+// $Id: Window.cc,v 1.249 2003/12/10 22:28:07 fluxgen Exp $
 
 #include "Window.hh"
 
@@ -2407,8 +2407,7 @@ void FluxboxWindow::motionNotifyEvent(XMotionEvent &me) {
                 moveResize(dx, dy, frame().width(), frame().height());
             }
 
-            if (screen().doShowWindowPos())
-                screen().showPosition(dx, dy);
+            screen().showPosition(dx, dy);
         } // end if moving
     } else if (functions.resize &&
                (((me.state & Button1Mask) && (me.window == frame().gripRight() ||
@@ -2468,8 +2467,7 @@ void FluxboxWindow::motionNotifyEvent(XMotionEvent &me) {
                                    m_last_resize_w - 1 + 2 * frame().window().borderWidth(), 
                                    m_last_resize_h - 1 + 2 * frame().window().borderWidth());
 
-            if (screen().doShowWindowPos())
-                screen().showGeometry(gx, gy);
+            screen().showGeometry(gx, gy);
         }
     } else if ((me.state & Button2Mask) && inside_titlebar && client != 0) {
 
@@ -2958,8 +2956,8 @@ void FluxboxWindow::startResizing(Window win, int x, int y) {
 
     fixsize(&gx, &gy);
 
-    if (screen().doShowWindowPos())
-        screen().showGeometry(gx, gy);
+
+    screen().showGeometry(gx, gy);
 
     parent().drawRectangle(screen().rootTheme().opGC(),
                            m_last_resize_x, m_last_resize_y,
-- 
cgit v0.11.2