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

ssd: eliminate ssd_hover_state (addressing a FIXME)

Browse source
This commit is contained in:
John Lindgren 2025-09-03 01:20:53 -04:00
parent 1188534876
commit ba426e2271
8 changed files with 14 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/ssd/ssd-titlebar.c
View file

@ -492,8 +492,7 @@ ssd_update_title(struct ssd *ssd)
}
void
ssd_update_button_hover(struct wlr_scene_node *node,
struct ssd_hover_state *hover_state)
ssd_update_hovered_button(struct server *server, struct wlr_scene_node *node)
{
struct ssd_part_button *button = NULL;
@ -502,7 +501,7 @@ ssd_update_button_hover(struct wlr_scene_node *node,
if (desc->type == LAB_NODE_DESC_SSD_PART) {
button = button_try_from_ssd_part(
node_ssd_part_from_node(node));
if (button == hover_state->button) {
if (button == server->hovered_button) {
/* Cursor is still on the same button */
return;
}
@ -510,15 +509,12 @@ ssd_update_button_hover(struct wlr_scene_node *node,
}
/* Disable old hover */
if (hover_state->button) {
update_button_state(hover_state->button, LAB_BS_HOVERED, false);
hover_state->view = NULL;
hover_state->button = NULL;
if (server->hovered_button) {
update_button_state(server->hovered_button, LAB_BS_HOVERED, false);
}
server->hovered_button = button;
if (button) {
update_button_state(button, LAB_BS_HOVERED, true);
hover_state->view = button->base.view;
hover_state->button = button;
}
}

14
src/ssd/ssd.c
View file

@ -264,11 +264,9 @@ ssd_destroy(struct ssd *ssd)
/* Maybe reset hover view */
struct view *view = ssd->view;
struct ssd_hover_state *hover_state;
hover_state = view->server->ssd_hover_state;
if (hover_state->view == view) {
hover_state->view = NULL;
hover_state->button = NULL;
struct server *server = view->server;
if (server->hovered_button && server->hovered_button->base.view == view) {
server->hovered_button = NULL;
}
/* Destroy subcomponents */
@ -345,12 +343,6 @@ ssd_enable_keybind_inhibit_indicator(struct ssd *ssd, bool enable)
wlr_scene_rect_set_color(ssd->border.subtrees[SSD_ACTIVE].top, color);
}
struct ssd_hover_state *
ssd_hover_state_new(void)
{
return znew(struct ssd_hover_state);
}
enum lab_node_type
ssd_part_get_type(const struct ssd_part *part)
{