mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-03-27 07:58:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

view/ssd: Move ssd->enabled to view->ssd_enabled

Browse source
This commit is contained in:
John Lindgren 2022-11-21 15:38:20 -05:00 • committed by Consolatis
parent c536ee9d96
commit 56f8837ca6
6 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/ssd.h
View file

@ -81,7 +81,6 @@ struct ssd_state_title_width {
}; };
struct ssd { struct ssd {
bool enabled;
struct wlr_scene_tree *tree; struct wlr_scene_tree *tree;
/* /*

1
include/view.h
View file

@ -48,6 +48,7 @@ struct view {
bool mapped; bool mapped;
bool been_mapped; bool been_mapped;
bool ssd_enabled;
bool minimized; bool minimized;
bool maximized; bool maximized;
uint32_t tiled; /* private, enum view_edge in src/view.c */ uint32_t tiled; /* private, enum view_edge in src/view.c */

2
src/server.c
View file

@ -40,7 +40,7 @@ reload_config_and_theme(void)
struct view *view; struct view *view;
wl_list_for_each(view, &g_server->views, link) { wl_list_for_each(view, &g_server->views, link) {
if (!view->mapped || !view->ssd.enabled) { if (!view->mapped || !view->ssd_enabled) {
continue; continue;
} }
ssd_reload(view); ssd_reload(view);

4
src/ssd/ssd.c
View file

@ -16,7 +16,7 @@
struct border struct border
ssd_thickness(struct view *view) ssd_thickness(struct view *view)
{ {
if (!view->ssd.enabled) { if (!view->ssd_enabled) {
struct border border = { 0 }; struct border border = { 0 };
return border; return border;
} }
@ -172,7 +172,7 @@ ssd_update_geometry(struct view *view)
return; return;
} }
if (!view->ssd.enabled) { if (!view->ssd_enabled) {
if (view->ssd.tree && view->ssd.tree->node.enabled) { if (view->ssd.tree && view->ssd.tree->node.enabled) {
wlr_scene_node_set_enabled(&view->ssd.tree->node, false); wlr_scene_node_set_enabled(&view->ssd.tree->node, false);
view->ssd.margin = ssd_thickness(view); view->ssd.margin = ssd_thickness(view);

8
src/view.c
View file

@ -404,7 +404,7 @@ view_apply_maximized_geometry(struct view *view)
box.width /= output->wlr_output->scale; box.width /= output->wlr_output->scale;
} }
if (view->ssd.enabled) { if (view->ssd_enabled) {
struct border border = ssd_thickness(view); struct border border = ssd_thickness(view);
box.x += border.left; box.x += border.left;
box.y += border.top; box.y += border.top;
@ -514,7 +514,7 @@ void
view_toggle_decorations(struct view *view) view_toggle_decorations(struct view *view)
{ {
assert(view); assert(view);
view_set_decorations(view, !view->ssd.enabled); view_set_decorations(view, !view->ssd_enabled);
} }
static bool static bool
@ -554,8 +554,8 @@ void
view_set_decorations(struct view *view, bool decorations) view_set_decorations(struct view *view, bool decorations)
{ {
assert(view); assert(view);
if (view->ssd.enabled != decorations && !view->fullscreen) { if (view->ssd_enabled != decorations && !view->fullscreen) {
view->ssd.enabled = decorations; view->ssd_enabled = decorations;
ssd_update_geometry(view); ssd_update_geometry(view);
if (view->maximized) { if (view->maximized) {
view_apply_maximized_geometry(view); view_apply_maximized_geometry(view);

2
src/xwayland.c
View file

@ -400,7 +400,7 @@ map(struct view *view)
view->been_mapped = true; view->been_mapped = true;
} }
if (view->ssd.enabled && !view->fullscreen && !view->maximized) { if (view->ssd_enabled && !view->fullscreen && !view->maximized) {
top_left_edge_boundary_check(view); top_left_edge_boundary_check(view);
} }