diff options
author | markt <markt> | 2007-02-11 22:33:16 (GMT) |
---|---|---|
committer | markt <markt> | 2007-02-11 22:33:16 (GMT) |
commit | 83a7202a669baa543df9c04f131d272664526b9c (patch) | |
tree | 8ae695665971254ecd343d7682243ec802a3ef63 /src/Window.cc | |
parent | f42d39cc351c1d6c6b424d451e0cc5ddcec8cab3 (diff) | |
download | fluxbox-83a7202a669baa543df9c04f131d272664526b9c.zip fluxbox-83a7202a669baa543df9c04f131d272664526b9c.tar.bz2 |
forgot to revert part of my previous patch
Diffstat (limited to 'src/Window.cc')
-rw-r--r-- | src/Window.cc | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/Window.cc b/src/Window.cc index 00da9d4..c324087 100644 --- a/src/Window.cc +++ b/src/Window.cc | |||
@@ -2814,16 +2814,11 @@ void FluxboxWindow::motionNotifyEvent(XMotionEvent &me) { | |||
2814 | 2814 | ||
2815 | screen().showPosition(dx, dy); | 2815 | screen().showPosition(dx, dy); |
2816 | } // end if moving | 2816 | } // end if moving |
2817 | } else if (isResizing() // if we're already resizing the window | 2817 | } else if (functions.resize && |
2818 | || functions.resize | 2818 | (((me.state & Button1Mask) && |
2819 | // or if we're dragging one of the grips | 2819 | (me.window == frame().gripRight() || |
2820 | && ((me.state & Button1Mask) | 2820 | me.window == frame().gripLeft())) || |
2821 | && (me.window == frame().gripRight() | 2821 | me.window == frame().window())) { |
2822 | || me.window == frame().gripLeft()) | ||
2823 | // or if we're right-click dragging the border | ||
2824 | || (me.state & Button3Mask) | ||
2825 | && me.window == frame().window() | ||
2826 | && !Fluxbox::instance()->getIgnoreBorder())) { | ||
2827 | 2822 | ||
2828 | if (! resizing) { | 2823 | if (! resizing) { |
2829 | 2824 | ||