X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmoveresize.c;h=b0b1f2a106daabeda8afb1a38aa3947084a8cc42;hb=44404518c3997c33758f9ed8dad57585e041454f;hp=afd0de2abbf11086b318599f6a5b533638f289e6;hpb=9a9e3f6bf6be75094636e37d54fb16e4456b43be;p=chaz%2Fopenbox diff --git a/openbox/moveresize.c b/openbox/moveresize.c index afd0de2a..b0b1f2a1 100644 --- a/openbox/moveresize.c +++ b/openbox/moveresize.c @@ -159,6 +159,8 @@ void moveresize_start(ObClient *c, gint x, gint y, guint b, guint32 cnr) (c->functions & OB_CLIENT_FUNC_RESIZE))) return; + frame_end_iconify_animation(c->frame); + moveresize_client = c; start_cx = c->area.x; start_cy = c->area.y; @@ -407,12 +409,12 @@ gboolean moveresize_event(XEvent *e) start_y = e->xbutton.y_root; button = e->xbutton.button; /* this will end it now */ } - used = TRUE; + used = e->xbutton.button == button; } else if (e->type == ButtonRelease) { if (!button || e->xbutton.button == button) { moveresize_end(FALSE); + used = TRUE; } - used = TRUE; } else if (e->type == MotionNotify) { if (moving) { cur_x = start_cx + e->xmotion.x_root - start_x;