static guint32 corner;
static ObCorner lockcorner;
-static Popup *popup = NULL;
+static ObPopup *popup = NULL;
static void client_dest(gpointer client)
{
void moveresize_shutdown(gboolean reconfig)
{
- if (!reconfig)
+ if (!reconfig) {
+ if (moveresize_in_progress)
+ moveresize_end(FALSE);
client_remove_destructor(client_dest);
+ }
popup_free(popup);
popup = NULL;
c->area.width / 2,
c->frame->area.y + c->frame->size.top +
c->area.height / 2);
- popup_show(popup, text, NULL);
+ popup_show(popup, text);
g_free(text);
}
/* get where the client should be */
frame_frame_gravity(moveresize_client->frame, &cur_x, &cur_y);
client_configure(moveresize_client, OB_CORNER_TOPLEFT, cur_x, cur_y,
- start_cw, start_ch, TRUE, FALSE);
+ moveresize_client->area.width,
+ moveresize_client->area.height, TRUE, FALSE);
}
static void do_resize(gboolean resist)