mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-02-21 01:40:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Support hover icons in titlebar (#1280)

Browse source 
Allow both max_toggled_hover and max_hover_toggled names for icons
This commit is contained in:
Simon Long 2023-12-06 20:33:26 +00:00 • committed by GitHub
parent 5d2f594626
commit c79b8ba8a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 258 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

105
src/theme.c
View file

@ -39,6 +39,7 @@
struct button {
const char *name;
const char *alt_name;
char fallback_button[6]; /* built-in 6x6 button */
struct {
struct lab_data_buffer **buffer;
@ -60,7 +61,7 @@ load_buttons(struct theme *theme)
{
struct button buttons[] = {
{
"menu",
"menu", NULL,
{ 0x00, 0x18, 0x3c, 0x3c, 0x18, 0x00 },
{
&theme->button_menu_active_unpressed,
@ -72,7 +73,7 @@ load_buttons(struct theme *theme)
},
},
{
"iconify",
"iconify", NULL,
{ 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f },
{
&theme->button_iconify_active_unpressed,
@ -84,7 +85,7 @@ load_buttons(struct theme *theme)
},
},
{
"max",
"max", NULL,
{ 0x3f, 0x3f, 0x21, 0x21, 0x21, 0x3f },
{
&theme->button_maximize_active_unpressed,
@ -96,7 +97,19 @@ load_buttons(struct theme *theme)
},
},
{
"close",
"max_toggled", NULL,
{ 0x3e, 0x22, 0x2f, 0x29, 0x39, 0x0f },
{
&theme->button_restore_active_unpressed,
theme->window_active_button_max_unpressed_image_color,
},
{
&theme->button_restore_inactive_unpressed,
theme->window_inactive_button_max_unpressed_image_color,
},
},
{
"close", NULL,
{ 0x33, 0x3f, 0x1e, 0x1e, 0x3f, 0x33 },
{
&theme->button_close_active_unpressed,
@ -107,9 +120,70 @@ load_buttons(struct theme *theme)
theme->window_inactive_button_close_unpressed_image_color,
},
},
{
"menu_hover", NULL,
{ 0x00, 0x18, 0x3c, 0x3c, 0x18, 0x00 },
{
&theme->button_menu_active_hover,
theme->window_active_button_menu_unpressed_image_color,
},
{
&theme->button_menu_inactive_hover,
theme->window_inactive_button_menu_unpressed_image_color,
},
},
{
"iconify_hover", NULL,
{ 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f },
{
&theme->button_iconify_active_hover,
theme->window_active_button_iconify_unpressed_image_color,
},
{
&theme->button_iconify_inactive_hover,
theme->window_inactive_button_iconify_unpressed_image_color,
},
},
{
"max_hover", NULL,
{ 0x3f, 0x3f, 0x21, 0x21, 0x21, 0x3f },
{
&theme->button_maximize_active_hover,
theme->window_active_button_max_unpressed_image_color,
},
{
&theme->button_maximize_inactive_hover,
theme->window_inactive_button_max_unpressed_image_color,
},
},
{
"max_hover_toggled", "max_toggled_hover",
{ 0x3e, 0x22, 0x2f, 0x29, 0x39, 0x0f },
{
&theme->button_restore_active_hover,
theme->window_active_button_max_unpressed_image_color,
},
{
&theme->button_restore_inactive_hover,
theme->window_inactive_button_max_unpressed_image_color,
},
},
{
"close_hover", NULL,
{ 0x33, 0x3f, 0x1e, 0x1e, 0x3f, 0x33 },
{
&theme->button_close_active_hover,
theme->window_active_button_close_unpressed_image_color,
},
{
&theme->button_close_inactive_hover,
theme->window_inactive_button_close_unpressed_image_color,
},
},
};
char filename[4096] = {0};
char alt_filename[4096] = {0};
for (size_t i = 0; i < ARRAY_SIZE(buttons); ++i) {
struct button *b = &buttons[i];
@ -119,8 +193,16 @@ load_buttons(struct theme *theme)
/* Try png icon first */
snprintf(filename, sizeof(filename), "%s-active.png", b->name);
button_png_load(filename, b->active.buffer);
if (!*b->active.buffer && b->alt_name) {
snprintf(filename, sizeof(filename), "%s-active.png", b->alt_name);
button_png_load(filename, b->active.buffer);
}
snprintf(filename, sizeof(filename), "%s-inactive.png", b->name);
button_png_load(filename, b->inactive.buffer);
if (!*b->inactive.buffer && b->alt_name) {
snprintf(filename, sizeof(filename), "%s-inactive.png", b->alt_name);
button_png_load(filename, b->inactive.buffer);
}
#if HAVE_RSVG
/* Then try svg icon */
@ -129,20 +211,31 @@ load_buttons(struct theme *theme)
snprintf(filename, sizeof(filename), "%s-active.svg", b->name);
button_svg_load(filename, b->active.buffer, size);
}
if (!*b->active.buffer && b->alt_name) {
snprintf(filename, sizeof(filename), "%s-active.svg", b->alt_name);
button_svg_load(filename, b->active.buffer, size);
}
if (!*b->inactive.buffer) {
snprintf(filename, sizeof(filename), "%s-inactive.svg", b->name);
button_svg_load(filename, b->inactive.buffer, size);
}
if (!*b->active.buffer && b->alt_name) {
snprintf(filename, sizeof(filename), "%s-inactive.svg", b->alt_name);
button_svg_load(filename, b->inactive.buffer, size);
}
#endif
/* If there were no png/svg buttons, use xbm */
snprintf(filename, sizeof(filename), "%s.xbm", b->name);
if (b->alt_name) {
snprintf(alt_filename, sizeof(alt_filename), "%s.xbm", b->alt_name);
}
if (!*b->active.buffer) {
button_xbm_load(filename, b->active.buffer,
button_xbm_load(filename, alt_filename, b->active.buffer,
b->fallback_button, b->active.rgba);
}
if (!*b->inactive.buffer) {
button_xbm_load(filename, b->inactive.buffer,
button_xbm_load(filename, alt_filename, b->inactive.buffer,
b->fallback_button, b->inactive.rgba);
}
}