diff options
author | fluxgen <fluxgen> | 2003-12-10 22:28:07 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2003-12-10 22:28:07 (GMT) |
commit | cb8e8e8d054b044db602326278055dc10f1c0c57 (patch) | |
tree | e8bb756a6909acb69589cce7db2ad144314c10cd /src | |
parent | 7fab9c0a0b97721f893a8c12e7cb4df40f1aa4ef (diff) | |
download | fluxbox-cb8e8e8d054b044db602326278055dc10f1c0c57.zip fluxbox-cb8e8e8d054b044db602326278055dc10f1c0c57.tar.bz2 |
fixed geometry bug
Diffstat (limited to 'src')
-rw-r--r-- | src/Screen.cc | 8 | ||||
-rw-r--r-- | 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 @@ | |||
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: Screen.cc,v 1.245 2003/12/07 16:39:43 fluxgen Exp $ | 25 | // $Id: Screen.cc,v 1.246 2003/12/10 22:28:07 fluxgen Exp $ |
26 | 26 | ||
27 | 27 | ||
28 | #include "Screen.hh" | 28 | #include "Screen.hh" |
@@ -2016,6 +2016,9 @@ void BScreen::shutdown() { | |||
2016 | 2016 | ||
2017 | 2017 | ||
2018 | void BScreen::showPosition(int x, int y) { | 2018 | void BScreen::showPosition(int x, int y) { |
2019 | if (!doShowWindowPos()) | ||
2020 | return; | ||
2021 | |||
2019 | if (! geom_visible) { | 2022 | if (! geom_visible) { |
2020 | if (hasXinerama()) { | 2023 | if (hasXinerama()) { |
2021 | unsigned int head = getCurrHead(); | 2024 | unsigned int head = getCurrHead(); |
@@ -2052,6 +2055,9 @@ void BScreen::showPosition(int x, int y) { | |||
2052 | 2055 | ||
2053 | 2056 | ||
2054 | void BScreen::showGeometry(unsigned int gx, unsigned int gy) { | 2057 | void BScreen::showGeometry(unsigned int gx, unsigned int gy) { |
2058 | if (!doShowWindowPos()) | ||
2059 | return; | ||
2060 | |||
2055 | if (! geom_visible) { | 2061 | if (! geom_visible) { |
2056 | if (hasXinerama()) { | 2062 | if (hasXinerama()) { |
2057 | unsigned int head = getCurrHead(); | 2063 | 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 @@ | |||
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: Window.cc,v 1.248 2003/12/07 17:47:42 fluxgen Exp $ | 25 | // $Id: Window.cc,v 1.249 2003/12/10 22:28:07 fluxgen Exp $ |
26 | 26 | ||
27 | #include "Window.hh" | 27 | #include "Window.hh" |
28 | 28 | ||
@@ -2407,8 +2407,7 @@ void FluxboxWindow::motionNotifyEvent(XMotionEvent &me) { | |||
2407 | moveResize(dx, dy, frame().width(), frame().height()); | 2407 | moveResize(dx, dy, frame().width(), frame().height()); |
2408 | } | 2408 | } |
2409 | 2409 | ||
2410 | if (screen().doShowWindowPos()) | 2410 | screen().showPosition(dx, dy); |
2411 | screen().showPosition(dx, dy); | ||
2412 | } // end if moving | 2411 | } // end if moving |
2413 | } else if (functions.resize && | 2412 | } else if (functions.resize && |
2414 | (((me.state & Button1Mask) && (me.window == frame().gripRight() || | 2413 | (((me.state & Button1Mask) && (me.window == frame().gripRight() || |
@@ -2468,8 +2467,7 @@ void FluxboxWindow::motionNotifyEvent(XMotionEvent &me) { | |||
2468 | m_last_resize_w - 1 + 2 * frame().window().borderWidth(), | 2467 | m_last_resize_w - 1 + 2 * frame().window().borderWidth(), |
2469 | m_last_resize_h - 1 + 2 * frame().window().borderWidth()); | 2468 | m_last_resize_h - 1 + 2 * frame().window().borderWidth()); |
2470 | 2469 | ||
2471 | if (screen().doShowWindowPos()) | 2470 | screen().showGeometry(gx, gy); |
2472 | screen().showGeometry(gx, gy); | ||
2473 | } | 2471 | } |
2474 | } else if ((me.state & Button2Mask) && inside_titlebar && client != 0) { | 2472 | } else if ((me.state & Button2Mask) && inside_titlebar && client != 0) { |
2475 | 2473 | ||
@@ -2958,8 +2956,8 @@ void FluxboxWindow::startResizing(Window win, int x, int y) { | |||
2958 | 2956 | ||
2959 | fixsize(&gx, &gy); | 2957 | fixsize(&gx, &gy); |
2960 | 2958 | ||
2961 | if (screen().doShowWindowPos()) | 2959 | |
2962 | screen().showGeometry(gx, gy); | 2960 | screen().showGeometry(gx, gy); |
2963 | 2961 | ||
2964 | parent().drawRectangle(screen().rootTheme().opGC(), | 2962 | parent().drawRectangle(screen().rootTheme().opGC(), |
2965 | m_last_resize_x, m_last_resize_y, | 2963 | m_last_resize_x, m_last_resize_y, |