aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--src/Window.cc17
2 files changed, 14 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 4b51ce9..6f31e5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0rc3: 2Changes for 1.0rc3:
3*07/02/10: 3*07/02/10:
4 * Fixed a bug with `session.ignoreBorder: true' (Mark)
5 Window.cc
4 * Fixed a bug with resizing windows for clients when only the width is 6 * Fixed a bug with resizing windows for clients when only the width is
5 specified (Mark) 7 specified (Mark)
6 Window.cc 8 Window.cc
diff --git a/src/Window.cc b/src/Window.cc
index 4c6c681..c83acd7 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -2689,7 +2689,8 @@ void FluxboxWindow::motionNotifyEvent(XMotionEvent &me) {
2689 || frame().label() == me.window 2689 || frame().label() == me.window
2690 || frame().tabcontainer() == me.window 2690 || frame().tabcontainer() == me.window
2691 || frame().handle() == me.window 2691 || frame().handle() == me.window
2692 || frame().window() == me.window); 2692 || frame().window() == me.window
2693 && !Fluxbox::instance()->getIgnoreBorder());
2693 2694
2694 if (Fluxbox::instance()->getIgnoreBorder() 2695 if (Fluxbox::instance()->getIgnoreBorder()
2695 && !(me.state & Fluxbox::instance()->getModKey()) // really should check for exact matches 2696 && !(me.state & Fluxbox::instance()->getModKey()) // really should check for exact matches
@@ -2800,10 +2801,16 @@ void FluxboxWindow::motionNotifyEvent(XMotionEvent &me) {
2800 2801
2801 screen().showPosition(dx, dy); 2802 screen().showPosition(dx, dy);
2802 } // end if moving 2803 } // end if moving
2803 } else if (functions.resize && 2804 } else if (isResizing() // if we're already resizing the window
2804 (((me.state & Button1Mask) && (me.window == frame().gripRight() || 2805 || functions.resize
2805 me.window == frame().gripLeft())) || 2806 // or if we're dragging one of the grips
2806 me.window == frame().window())) { 2807 && ((me.state & Button1Mask)
2808 && (me.window == frame().gripRight()
2809 || me.window == frame().gripLeft())
2810 // or if we're right-click dragging the border
2811 || (me.state & Button3Mask)
2812 && me.window == frame().window()
2813 && !Fluxbox::instance()->getIgnoreBorder())) {
2807 2814
2808 if (! resizing) { 2815 if (! resizing) {
2809 2816