summaryrefslogtreecommitdiff
path: root/openbox
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2007-05-27 04:16:14 +0000
committerDana Jansens <danakj@orodu.net>2007-05-27 04:16:14 +0000
commitfe99440c1666db533eeed102a3860d3c0c191f4e (patch)
treee60f68b125e227b6a1a3dcf76f8843d2aa434592 /openbox
parent47986dcd9cb4bc9c23012a52bb6bcd21d62954f1 (diff)
don't set the global moving state unless the move/resize is accepted
Diffstat (limited to 'openbox')
-rw-r--r--openbox/moveresize.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index 8ef18a87..7b946007 100644
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -152,12 +152,11 @@ static void popup_coords(ObClient *c, const gchar *format, gint a, gint b)
void moveresize_start(ObClient *c, gint x, gint y, guint b, guint32 cnr)
{
ObCursor cur;
-
- moving = (cnr == prop_atoms.net_wm_moveresize_move ||
- cnr == prop_atoms.net_wm_moveresize_move_keyboard);
+ gboolean mv = (cnr == prop_atoms.net_wm_moveresize_move ||
+ cnr == prop_atoms.net_wm_moveresize_move_keyboard);
if (moveresize_in_progress || !c->frame->visible ||
- !(moving ?
+ !(mv ?
(c->functions & OB_CLIENT_FUNC_MOVE) :
(c->functions & OB_CLIENT_FUNC_RESIZE)))
return;
@@ -197,6 +196,7 @@ void moveresize_start(ObClient *c, gint x, gint y, guint b, guint32 cnr)
frame_end_iconify_animation(c->frame);
+ moving = mv;
moveresize_client = c;
start_cx = c->area.x;
start_cy = c->area.y;