From fe99440c1666db533eeed102a3860d3c0c191f4e Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sun, 27 May 2007 04:16:14 +0000 Subject: [PATCH] don't set the global moving state unless the move/resize is accepted --- openbox/moveresize.c | 8 ++++---- 1 file 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; -- 2.45.2