mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-10-31 22:25:34 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

menu: show app icons in client-list-combined-menu

Browse source
This commit is contained in:
tokyo4j 2025-03-12 04:04:50 +09:00 • committed by Johan Malm
parent 54186e5152
commit e517b6808d
1 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/menu/menu.c
View file

@ -185,10 +185,20 @@ item_create_scene_for_state(struct menuitem *item, float *text_color,
int label_max_width = bg_width - 2 * theme->menu_items_padding_x - arrow_width - icon_width; int label_max_width = bg_width - 2 * theme->menu_items_padding_x - arrow_width - icon_width;
/* Create icon */ /* Create icon */
if (item->icon_name) { bool show_app_icon = !strcmp(item->parent->id, "client-list-combined-menu")
&& item->client_list_view;
if (item->icon_name || show_app_icon) {
struct scaled_icon_buffer *icon_buffer = scaled_icon_buffer_create( struct scaled_icon_buffer *icon_buffer = scaled_icon_buffer_create(
tree, menu->server, icon_size, icon_size); tree, menu->server, icon_size, icon_size);
scaled_icon_buffer_set_icon_name(icon_buffer, item->icon_name); if (item->icon_name) {
/* icon set via <menu icon="..."> */
scaled_icon_buffer_set_icon_name(icon_buffer, item->icon_name);
} else if (show_app_icon) {
/* app icon in client-list-combined-menu */
const char *app_id = view_get_string_prop(
item->client_list_view, "app_id");
scaled_icon_buffer_set_app_id(icon_buffer, app_id);
}
wlr_scene_node_set_position(&icon_buffer->scene_buffer->node, wlr_scene_node_set_position(&icon_buffer->scene_buffer->node,
theme->menu_items_padding_x, theme->menu_items_padding_y); theme->menu_items_padding_x, theme->menu_items_padding_y);
} }
@ -1033,6 +1043,7 @@ update_client_list_combined_menu(struct server *server)
fill_item("name.action", "Focus"); fill_item("name.action", "Focus");
fill_item("name.action", "Raise"); fill_item("name.action", "Raise");
buf_clear(&buffer); buf_clear(&buffer);
menu->has_icons = true;
} }
} }
current_item = item_create(menu, _("Go there..."), /*show arrow*/ false); current_item = item_create(menu, _("Go there..."), /*show arrow*/ false);