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: Allocate struct ssd and struct ssd_hover_state separately

Browse source 
- Store a pointer to the `struct view` in `struct ssd`
- Pass `struct ssd *` instead of `struct view *` to ssd functions
- Add `ssd_get_margin()` convenience function
This commit is contained in:
John Lindgren 2022-11-26 16:46:28 -05:00 • committed by Johan Malm
parent cfa51ab628
commit 1e8b0414fe
15 changed files with 112 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/ssd/ssd_titlebar.c
View file

@ -20,7 +20,7 @@
void
ssd_titlebar_create(struct ssd *ssd)
{
struct view *view = wl_container_of(ssd, view, ssd);
struct view *view = ssd->view;
struct theme *theme = view->server->theme;
int width = view->w;
@ -78,7 +78,7 @@ ssd_titlebar_create(struct ssd *ssd)
corner_top_right, close_button_unpressed,
width - BUTTON_WIDTH * 1, view);
} FOR_EACH_END
ssd_update_title(view);
ssd_update_title(ssd);
}
static bool
@ -90,7 +90,7 @@ is_direct_child(struct wlr_scene_node *node, struct ssd_sub_tree *subtree)
void
ssd_titlebar_update(struct ssd *ssd)
{
struct view *view = wl_container_of(ssd, view, ssd);
struct view *view = ssd->view;
int width = view->w;
if (width == ssd->state.width) {
return;
@ -131,7 +131,7 @@ ssd_titlebar_update(struct ssd *ssd)
}
}
} FOR_EACH_END
ssd_update_title(view);
ssd_update_title(ssd);
}
void
@ -169,7 +169,7 @@ ssd_titlebar_destroy(struct ssd *ssd)
static void
ssd_update_title_positions(struct ssd *ssd)
{
struct view *view = wl_container_of(ssd, view, ssd);
struct view *view = ssd->view;
struct theme *theme = view->server->theme;
int width = view->w;
int title_bg_width = width - BUTTON_WIDTH * BUTTON_COUNT;
@ -219,13 +219,13 @@ ssd_update_title_positions(struct ssd *ssd)
}
void
ssd_update_title(struct view *view)
ssd_update_title(struct ssd *ssd)
{
struct ssd *ssd = &view->ssd;
if (!ssd->tree) {
if (!ssd) {
return;
}
struct view *view = ssd->view;
char *title = (char *)view_get_string_prop(view, "title");
if (!title || !*title) {
return;