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

ssd: Eliminate unnecessary temporary variables

Browse source
This commit is contained in:
John Lindgren 2022-11-26 02:22:03 -05:00 • committed by Johan Malm
parent 4e7891eb8d
commit cb16da5a78
1 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/ssd/ssd.c
View file

@ -17,30 +17,27 @@ struct border
ssd_thickness(struct view *view) ssd_thickness(struct view *view)
{ {
if (!view->ssd_enabled) { if (!view->ssd_enabled) {
struct border border = { 0 }; return (struct border){ 0 };
return border;
} }
struct theme *theme = view->server->theme; struct theme *theme = view->server->theme;
struct border border = { return (struct border){
.top = theme->title_height + theme->border_width, .top = theme->title_height + theme->border_width,
.bottom = theme->border_width, .bottom = theme->border_width,
.left = theme->border_width, .left = theme->border_width,
.right = theme->border_width, .right = theme->border_width,
}; };
return border;
} }
struct wlr_box struct wlr_box
ssd_max_extents(struct view *view) ssd_max_extents(struct view *view)
{ {
struct border border = ssd_thickness(view); struct border border = ssd_thickness(view);
struct wlr_box box = { return (struct wlr_box){
.x = view->x - border.left, .x = view->x - border.left,
.y = view->y - border.top, .y = view->y - border.top,
.width = view->w + border.left + border.right, .width = view->w + border.left + border.right,
.height = view->h + border.top + border.bottom, .height = view->h + border.top + border.bottom,
}; };
return box;
} }
bool bool
@ -165,9 +162,7 @@ ssd_update_geometry(struct view *view)
return; return;
} }
int width = view->w; if (view->w == view->ssd.state.width && view->h == view->ssd.state.height) {
int height = view->h;
if (width == view->ssd.state.width && height == view->ssd.state.height) {
if (view->x != view->ssd.state.x || view->y != view->ssd.state.y) { if (view->x != view->ssd.state.x || view->y != view->ssd.state.y) {
/* Dynamically resize extents based on position and usable_area */ /* Dynamically resize extents based on position and usable_area */
ssd_extents_update(view); ssd_extents_update(view);
@ -180,8 +175,8 @@ ssd_update_geometry(struct view *view)
ssd_border_update(view); ssd_border_update(view);
ssd_titlebar_update(view); ssd_titlebar_update(view);
view->ssd.state.width = width; view->ssd.state.width = view->w;
view->ssd.state.height = height; view->ssd.state.height = view->h;
view->ssd.state.x = view->x; view->ssd.state.x = view->x;
view->ssd.state.y = view->y; view->ssd.state.y = view->y;
} }