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

ssd: support window icons

Browse source 
The default `titleLayout` is updated to `icon:iconify,max,close` which
replaces the window menu button with the window icon.

When the icon file is not found or could not be loaded, the window menu
icon as before is shown.

The icon theme can be selected with `<theme><icon>`.

This commit adds libsfdo as an optional dependency. `-Dicon=disabled` can
be passsed to `meson setup` command in order to disable window icon, in
which case the window icon is always replaced with a window menu button.
This commit is contained in:
tokyo4j 2024-09-06 17:00:40 +09:00 • committed by Hiroaki Yamamoto
parent b9414d8b8d
commit a745f91169
32 changed files with 452 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,10 +4,14 @@
#include <assert.h>
#include <string.h>
#include "buffer.h"
#include "config.h"
#include "common/mem.h"
#include "common/scaled-font-buffer.h"
#include "common/scene-helpers.h"
#include "common/string-helpers.h"
#if HAVE_LIBSFDO
#include "icon-loader.h"
#endif
#include "labwc.h"
#include "node.h"
#include "ssd-internal.h"
@ -34,6 +38,7 @@ add_button(struct ssd *ssd, struct ssd_sub_tree *subtree, enum ssd_part_type typ
struct ssd_button *btn;
switch (type) {
case LAB_SSD_BUTTON_WINDOW_ICON: /* fallthrough */
case LAB_SSD_BUTTON_WINDOW_MENU:
add_scene_button(&subtree->parts, type, parent,
active ? &theme->button_menu_active_unpressed->base
@ -171,6 +176,7 @@ ssd_titlebar_create(struct ssd *ssd)
update_visible_buttons(ssd);
ssd_update_title(ssd);
ssd_update_window_icon(ssd);
bool maximized = view->maximized == VIEW_AXIS_BOTH;
if (maximized) {
@ -368,7 +374,9 @@ ssd_titlebar_update(struct ssd *ssd)
wlr_scene_node_set_position(part->node, x, 0);
}
} FOR_EACH_END
ssd_update_title(ssd);
ssd_update_window_icon(ssd);
}
void
@ -386,8 +394,10 @@ ssd_titlebar_destroy(struct ssd *ssd)
} FOR_EACH_END
if (ssd->state.title.text) {
free(ssd->state.title.text);
ssd->state.title.text = NULL;
zfree(ssd->state.title.text);
}
if (ssd->state.app_id) {
zfree(ssd->state.app_id);
}
wlr_scene_node_destroy(&ssd->titlebar.tree->node);
@ -624,4 +634,50 @@ ssd_should_be_squared(struct ssd *ssd)
&& view->maximized != VIEW_AXIS_BOTH;
}
void
ssd_update_window_icon(struct ssd *ssd)
{
#if HAVE_LIBSFDO
const char *app_id = view_get_string_prop(ssd->view, "app_id");
if (string_null_or_empty(app_id)) {
return;
}
if (ssd->state.app_id && !strcmp(ssd->state.app_id, app_id)) {
return;
}
free(ssd->state.app_id);
ssd->state.app_id = xstrdup(app_id);
struct theme *theme = ssd->view->server->theme;
int icon_size = MIN(theme->window_button_width,
theme->title_height - 2 * theme->padding_height);
/* TODO: take into account output scales */
int icon_scale = 1;
struct lab_data_buffer *icon_buffer = icon_loader_lookup(
ssd->view->server, app_id, icon_size, icon_scale);
if (!icon_buffer) {
wlr_log(WLR_DEBUG, "icon could not be loaded for %s", app_id);
return;
}
struct ssd_sub_tree *subtree;
FOR_EACH_STATE(ssd, subtree) {
struct ssd_part *part =
ssd_get_part(&subtree->parts, LAB_SSD_BUTTON_WINDOW_ICON);
if (!part) {
break;
}
struct ssd_button *button = node_ssd_button_from_node(part->node);
update_window_icon_buffer(button->normal, &icon_buffer->base);
update_window_icon_buffer(button->hover, &icon_buffer->base);
} FOR_EACH_END
wlr_buffer_drop(&icon_buffer->base);
#endif
}
#undef FOR_EACH_STATE