mirror of
https://github.com/labwc/labwc.git
synced 2026-04-08 08:21:09 -04:00
Merge f57e8a4e91 into d1a9529239
This commit is contained in:
commit
e31d153189
3 changed files with 10 additions and 0 deletions
|
|
@ -174,6 +174,7 @@ struct view {
|
||||||
enum ssd_preference ssd_preference;
|
enum ssd_preference ssd_preference;
|
||||||
bool shaded;
|
bool shaded;
|
||||||
bool minimized;
|
bool minimized;
|
||||||
|
bool remaximize;
|
||||||
enum view_axis maximized;
|
enum view_axis maximized;
|
||||||
bool fullscreen;
|
bool fullscreen;
|
||||||
bool tearing_hint;
|
bool tearing_hint;
|
||||||
|
|
|
||||||
|
|
@ -290,6 +290,8 @@ process_cursor_move(struct server *server, uint32_t time)
|
||||||
};
|
};
|
||||||
interactive_anchor_to_cursor(server, &new_geo);
|
interactive_anchor_to_cursor(server, &new_geo);
|
||||||
/* Shaded clients will not process resize events until unshaded */
|
/* Shaded clients will not process resize events until unshaded */
|
||||||
|
if (view->maximized == VIEW_AXIS_BOTH)
|
||||||
|
view->remaximize = true;
|
||||||
view_set_shade(view, false);
|
view_set_shade(view, false);
|
||||||
view_set_untiled(view);
|
view_set_untiled(view);
|
||||||
view_restore_to(view, new_geo);
|
view_restore_to(view, new_geo);
|
||||||
|
|
|
||||||
|
|
@ -153,6 +153,8 @@ interactive_begin(struct view *view, enum input_mode mode, enum lab_edge edges)
|
||||||
interactive_anchor_to_cursor(server, &natural_geo);
|
interactive_anchor_to_cursor(server, &natural_geo);
|
||||||
/* Shaded clients will not process resize events until unshaded */
|
/* Shaded clients will not process resize events until unshaded */
|
||||||
view_set_shade(view, false);
|
view_set_shade(view, false);
|
||||||
|
if (view->maximized == VIEW_AXIS_BOTH)
|
||||||
|
view->remaximize = true;
|
||||||
view_set_untiled(view);
|
view_set_untiled(view);
|
||||||
view_restore_to(view, natural_geo);
|
view_restore_to(view, natural_geo);
|
||||||
}
|
}
|
||||||
|
|
@ -288,6 +290,11 @@ interactive_finish(struct view *view)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (view->remaximize) {
|
||||||
|
view_maximize(view, VIEW_AXIS_BOTH, true);
|
||||||
|
view->remaximize = false;
|
||||||
|
}
|
||||||
|
|
||||||
interactive_cancel(view);
|
interactive_cancel(view);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue