mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-03 09:01:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

view: remove duplicate code

Browse source
This commit is contained in:
Johan Malm 2021-07-20 20:06:26 +01:00
parent 49a73befdb
commit fa13f8f197
1 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/view.c
View file

@ -73,6 +73,21 @@ view_center(struct view *view)
view_move(view, center_x - view->w / 2, center_y - view->h / 2); view_move(view, center_x - view->w / 2, center_y - view->h / 2);
} }
static struct wlr_box
usable_area_in_layout_coords(struct output *output)
{
struct wlr_box box;
memcpy(&box, &output->usable_area, sizeof(struct wlr_box));
double ox = 0, oy = 0;
wlr_output_layout_output_coords(output->server->output_layout,
output->wlr_output, &ox, &oy);
box.x -= ox;
box.y -= oy;
return box;
}
void void
view_maximize(struct view *view, bool maximize) view_maximize(struct view *view, bool maximize)
{ {
@ -87,14 +102,7 @@ view_maximize(struct view *view, bool maximize)
view->unmaximized_geometry.height = view->h; view->unmaximized_geometry.height = view->h;
struct output *output = view_output(view); struct output *output = view_output(view);
struct wlr_box box; struct wlr_box box = usable_area_in_layout_coords(output);
memcpy(&box, &output->usable_area, sizeof(struct wlr_box));
double ox = 0, oy = 0;
wlr_output_layout_output_coords(view->server->output_layout,
output->wlr_output, &ox, &oy);
box.x -= ox;
box.y -= oy;
if (view->ssd.enabled) { if (view->ssd.enabled) {
struct border border = ssd_thickness(view); struct border border = ssd_thickness(view);
@ -153,14 +161,7 @@ view_move_to_edge(struct view *view, char *direction)
} }
struct output *output = view_output(view); struct output *output = view_output(view);
struct border border = view_border(view); struct border border = view_border(view);
struct wlr_box usable; struct wlr_box usable = usable_area_in_layout_coords(output);
memcpy(&usable, &output->usable_area, sizeof(struct wlr_box));
double ox = 0, oy = 0;
wlr_output_layout_output_coords(view->server->output_layout,
output->wlr_output, &ox, &oy);
usable.x -= ox;
usable.y -= oy;
int x, y; int x, y;
if (!strcasecmp(direction, "left")) { if (!strcasecmp(direction, "left")) {