mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-04-12 08:21:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Use overlay colour rather than fallback icon if hover icons not defined

Browse source
This commit is contained in:
Simon Long 2023-12-07 14:15:51 +00:00
parent 02aa000b0d
commit a57327c3c5
5 changed files with 48 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/ssd-internal.h
View file

@ -23,6 +23,7 @@ struct ssd_button {
struct wlr_scene_node *toggled;
struct wlr_scene_node *toggled_hover;
struct wlr_scene_node *background;
bool shade_hover;
struct wl_listener destroy;
};

5
src/button/button-xbm.c
View file

@ -294,7 +294,12 @@ button_xbm_load(const char *button_name, const char *alt_name,
}
}
}
if (!pixmap.data) {
if (fallback_button[0] == 0xFF) {
*buffer = NULL;
return;
}
pixmap = parse_xbm_builtin(fallback_button, 6);
}

52
src/ssd/ssd_part.c
View file

@ -165,16 +165,23 @@ add_scene_button(struct wl_list *part_list, enum ssd_part_type type,
icon_geo.width, icon_geo.height);
/* Hover icon */
struct wlr_box hover_geo = get_scale_box(hover_buffer,
SSD_BUTTON_WIDTH, rc.theme->title_height);
struct ssd_part *hover_part = add_scene_buffer(part_list, type,
parent, hover_buffer, hover_geo.x, hover_geo.y);
/* Make sure big icons are scaled down if necessary */
wlr_scene_buffer_set_dest_size(
wlr_scene_buffer_from_node(hover_part->node),
hover_geo.width, hover_geo.height);
struct ssd_part *hover_part;
if (hover_buffer) {
struct wlr_box hover_geo = get_scale_box(hover_buffer,
SSD_BUTTON_WIDTH, rc.theme->title_height);
hover_part = add_scene_buffer(part_list, type, parent,
hover_buffer, hover_geo.x, hover_geo.y);
/* Make sure big icons are scaled down if necessary */
wlr_scene_buffer_set_dest_size(
wlr_scene_buffer_from_node(hover_part->node),
hover_geo.width, hover_geo.height);
}
else {
float hover_bg[4] = {0.15f, 0.15f, 0.15f, 0.3f};
hover_part = add_scene_rect(part_list, type, parent,
SSD_BUTTON_WIDTH, rc.theme->title_height, 0, 0, hover_bg);
}
wlr_scene_node_set_enabled(hover_part->node, false);
struct ssd_button *button = ssd_button_descriptor_create(button_root->node);
@ -185,6 +192,7 @@ add_scene_button(struct wl_list *part_list, enum ssd_part_type type,
button->background = bg_rect->node;
button->toggled = NULL;
button->toggled_hover = NULL;
button->shade_hover = hover_buffer ? false : true;
return button_root;
}
@ -209,16 +217,24 @@ add_toggled_icon(struct wl_list *part_list, enum ssd_part_type type,
wlr_scene_node_set_enabled(alticon_part->node, false);
struct wlr_box hover_geo = get_scale_box(hover_buffer,
SSD_BUTTON_WIDTH, rc.theme->title_height);
struct ssd_part *althover_part = add_scene_buffer(part_list, type,
parent, hover_buffer, hover_geo.x, hover_geo.y);
struct ssd_part *althover_part;
if (hover_buffer) {
struct wlr_box hover_geo = get_scale_box(hover_buffer,
SSD_BUTTON_WIDTH, rc.theme->title_height);
althover_part = add_scene_buffer(part_list, type,
parent, hover_buffer, hover_geo.x, hover_geo.y);
wlr_scene_buffer_set_dest_size(
wlr_scene_buffer_from_node(althover_part->node),
hover_geo.width, hover_geo.height);
wlr_scene_node_set_enabled(althover_part->node, false);
wlr_scene_buffer_set_dest_size(
wlr_scene_buffer_from_node(althover_part->node),
hover_geo.width, hover_geo.height);
}
else
{
float hover_bg[4] = {0.15f, 0.15f, 0.15f, 0.3f};
althover_part = add_scene_rect(part_list, type, parent,
SSD_BUTTON_WIDTH, rc.theme->title_height, 0, 0, hover_bg);
}
wlr_scene_node_set_enabled (althover_part->node, false);
button->toggled = alticon_part->node;
button->toggled_hover = althover_part->node;

4
src/ssd/ssd_titlebar.c
View file

@ -417,7 +417,9 @@ disable_old_hover:
hover_state->node = maximized ? button->toggled_hover : button->hover;
hover_state->old_node = maximized ? button->toggled : button->normal;
hover_state->maximized = button->toggled ? (int)button->view->maximized : -1;
wlr_scene_node_set_enabled(maximized ? button->toggled : button->normal, false);
if (!button->shade_hover) {
wlr_scene_node_set_enabled(maximized ? button->toggled : button->normal, false);
}
}
}

10
src/theme.c
View file

@ -122,7 +122,7 @@ load_buttons(struct theme *theme)
},
{
"menu_hover", NULL,
{ 0x00, 0x18, 0x3c, 0x3c, 0x18, 0x00 },
{ 0xFF, 0, 0, 0, 0, 0 },
{
&theme->button_menu_active_hover,
theme->window_active_button_menu_unpressed_image_color,
@ -134,7 +134,7 @@ load_buttons(struct theme *theme)
},
{
"iconify_hover", NULL,
{ 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f },
{ 0xFF, 0, 0, 0, 0, 0 },
{
&theme->button_iconify_active_hover,
theme->window_active_button_iconify_unpressed_image_color,
@ -146,7 +146,7 @@ load_buttons(struct theme *theme)
},
{
"max_hover", NULL,
{ 0x3f, 0x3f, 0x21, 0x21, 0x21, 0x3f },
{ 0xFF, 0, 0, 0, 0, 0 },
{
&theme->button_maximize_active_hover,
theme->window_active_button_max_unpressed_image_color,
@ -158,7 +158,7 @@ load_buttons(struct theme *theme)
},
{
"max_hover_toggled", "max_toggled_hover",
{ 0x3e, 0x22, 0x2f, 0x29, 0x39, 0x0f },
{ 0xFF, 0, 0, 0, 0, 0 },
{
&theme->button_restore_active_hover,
theme->window_active_button_max_unpressed_image_color,
@ -170,7 +170,7 @@ load_buttons(struct theme *theme)
},
{
"close_hover", NULL,
{ 0x33, 0x3f, 0x1e, 0x1e, 0x3f, 0x33 },
{ 0xFF, 0, 0, 0, 0, 0 },
{
&theme->button_close_active_hover,
theme->window_active_button_close_unpressed_image_color,