mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-04 13:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename unmaximized_geometry to natural_geometry

Browse source
This commit is contained in:
Consolatis 2022-07-01 19:34:56 +02:00 • committed by Johan Malm
parent 02595eefaa
commit 5585977f72
3 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/labwc.h
View file

@ -312,8 +312,8 @@ struct view {
/* geometry of the wlr_surface contained within the view */ /* geometry of the wlr_surface contained within the view */
int x, y, w, h; int x, y, w, h;
/* geometry before maximize */ /* user defined geometry before maximize / tiling / fullscreen */
struct wlr_box unmaximized_geometry; struct wlr_box natural_geometry;
/* /*
* margin refers to the space between the extremities of the * margin refers to the space between the extremities of the

16
src/interactive.c
View file

@ -20,11 +20,11 @@ interactive_begin(struct view *view, enum input_mode mode, uint32_t edges)
if (view->maximized) { if (view->maximized) {
if (mode == LAB_INPUT_STATE_MOVE) { if (mode == LAB_INPUT_STATE_MOVE) {
int new_x = max_move_scale(view->server->seat.cursor->x, int new_x = max_move_scale(view->server->seat.cursor->x,
view->x, view->w, view->unmaximized_geometry.width); view->x, view->w, view->natural_geometry.width);
int new_y = max_move_scale(view->server->seat.cursor->y, int new_y = max_move_scale(view->server->seat.cursor->y,
view->y, view->h, view->unmaximized_geometry.height); view->y, view->h, view->natural_geometry.height);
view->unmaximized_geometry.x = new_x; view->natural_geometry.x = new_x;
view->unmaximized_geometry.y = new_y; view->natural_geometry.y = new_y;
view_maximize(view, false); view_maximize(view, false);
/* /*
* view_maximize() indirectly calls view->impl->configure * view_maximize() indirectly calls view->impl->configure
@ -34,8 +34,8 @@ interactive_begin(struct view *view, enum input_mode mode, uint32_t edges)
*/ */
view->x = new_x; view->x = new_x;
view->y = new_y; view->y = new_y;
view->w = view->unmaximized_geometry.width; view->w = view->natural_geometry.width;
view->h = view->unmaximized_geometry.height; view->h = view->natural_geometry.height;
} else { } else {
return; return;
} }
@ -102,9 +102,9 @@ interactive_end(struct view *view)
* When unmaximizing later on restore * When unmaximizing later on restore
* original position * original position
*/ */
view->unmaximized_geometry.x = view->natural_geometry.x =
view->server->grab_box.x; view->server->grab_box.x;
view->unmaximized_geometry.y = view->natural_geometry.y =
view->server->grab_box.y; view->server->grab_box.y;
} else { } else {
view_snap_to_edge(view, "up"); view_snap_to_edge(view, "up");

36
src/view.c
View file

@ -344,13 +344,13 @@ view_apply_maximized_geometry(struct view *view)
static void static void
set_fallback_geometry(struct view *view) set_fallback_geometry(struct view *view)
{ {
view->unmaximized_geometry.width = LAB_FALLBACK_WIDTH; view->natural_geometry.width = LAB_FALLBACK_WIDTH;
view->unmaximized_geometry.height = LAB_FALLBACK_HEIGHT; view->natural_geometry.height = LAB_FALLBACK_HEIGHT;
view_compute_centered_position(view, view_compute_centered_position(view,
view->unmaximized_geometry.width, view->natural_geometry.width,
view->unmaximized_geometry.height, view->natural_geometry.height,
&view->unmaximized_geometry.x, &view->natural_geometry.x,
&view->unmaximized_geometry.y); &view->natural_geometry.y);
} }
static void static void
@ -361,18 +361,18 @@ view_apply_unmaximized_geometry(struct view *view)
* width/height may still be zero in which case we set some fallback * width/height may still be zero in which case we set some fallback
* values. This is the case with foot and Qt applications. * values. This is the case with foot and Qt applications.
*/ */
if (wlr_box_empty(&view->unmaximized_geometry)) { if (wlr_box_empty(&view->natural_geometry)) {
set_fallback_geometry(view); set_fallback_geometry(view);
} }
struct wlr_output_layout *layout = view->server->output_layout; struct wlr_output_layout *layout = view->server->output_layout;
if (wlr_output_layout_intersects(layout, NULL, if (wlr_output_layout_intersects(layout, NULL,
&view->unmaximized_geometry)) { &view->natural_geometry)) {
/* restore to original geometry */ /* restore to original geometry */
view_move_resize(view, view->unmaximized_geometry); view_move_resize(view, view->natural_geometry);
} else { } else {
/* reposition if original geometry is offscreen */ /* reposition if original geometry is offscreen */
struct wlr_box box = view->unmaximized_geometry; struct wlr_box box = view->natural_geometry;
if (view_compute_centered_position(view, box.width, box.height, if (view_compute_centered_position(view, box.width, box.height,
&box.x, &box.y)) { &box.x, &box.y)) {
view_move_resize(view, box); view_move_resize(view, box);
@ -398,10 +398,10 @@ view_maximize(struct view *view, bool maximize)
} }
if (maximize) { if (maximize) {
interactive_end(view); interactive_end(view);
view->unmaximized_geometry.x = view->x; view->natural_geometry.x = view->x;
view->unmaximized_geometry.y = view->y; view->natural_geometry.y = view->y;
view->unmaximized_geometry.width = view->w; view->natural_geometry.width = view->w;
view->unmaximized_geometry.height = view->h; view->natural_geometry.height = view->h;
view_apply_maximized_geometry(view); view_apply_maximized_geometry(view);
view->maximized = true; view->maximized = true;
@ -494,10 +494,10 @@ view_set_fullscreen(struct view *view, bool fullscreen,
} }
if (fullscreen) { if (fullscreen) {
if (!view->maximized) { if (!view->maximized) {
view->unmaximized_geometry.x = view->x; view->natural_geometry.x = view->x;
view->unmaximized_geometry.y = view->y; view->natural_geometry.y = view->y;
view->unmaximized_geometry.width = view->w; view->natural_geometry.width = view->w;
view->unmaximized_geometry.height = view->h; view->natural_geometry.height = view->h;
} }
view->fullscreen = wlr_output; view->fullscreen = wlr_output;
view_apply_fullscreen_geometry(view, view->fullscreen); view_apply_fullscreen_geometry(view, view->fullscreen);