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

osd: add thumbnailLabelFormat to windowSwitcher (#3187)
Some checks failed
labwc.github.io / notify (push) Has been cancelled
Details

Browse source 
This commit adds `<windowSwitcher thumbnailLabelFormat="%T">` to configure the label text in each item in the thumbnail-style window switcher. Its format follows `<fields><field content="custom" format="">`.
This commit is contained in:
elviosak 2025-11-05 06:23:15 -03:00 • committed by GitHub
parent 8b950350ed
commit c8167c8ee0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 34 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/config/rcxml.c
View file

@ -1208,6 +1208,8 @@ entry(xmlNode *node, char *nodename, char *content)
} else if (!strcasecmp(content, "thumbnail")) {
rc.window_switcher.style = WINDOW_SWITCHER_THUMBNAIL;
}
} else if (!strcasecmp(nodename, "thumbnailLabelFormat.windowSwitcher")) {
xstrdup_replace(rc.window_switcher.thumbnail_label_format, content);
} else if (!strcasecmp(nodename, "preview.windowSwitcher")) {
set_bool(content, &rc.window_switcher.preview);
} else if (!strcasecmp(nodename, "outlines.windowSwitcher")) {
@ -1429,6 +1431,7 @@ rcxml_init(void)
rc.window_switcher.show = true;
rc.window_switcher.style = WINDOW_SWITCHER_CLASSIC;
rc.window_switcher.thumbnail_label_format = xstrdup("%T");
rc.window_switcher.preview = true;
rc.window_switcher.outlines = true;
rc.window_switcher.unshade = true;
@ -1905,6 +1908,7 @@ rcxml_finish(void)
zfree(rc.fallback_app_icon_name);
zfree(rc.workspace_config.prefix);
zfree(rc.tablet.output_name);
zfree(rc.window_switcher.thumbnail_label_format);
clear_title_layout();

9
src/osd/osd-field.c
View file

@ -189,9 +189,6 @@ field_set_title_short(struct buf *buf, struct view *view, const char *format)
buf_add(buf, get_title_if_different(view));
}
static void field_set_custom(struct buf *buf, struct view *view,
const char *format);
static const struct field_converter field_converter[LAB_FIELD_COUNT] = {
[LAB_FIELD_TYPE] = { 'B', field_set_type },
[LAB_FIELD_TYPE_SHORT] = { 'b', field_set_type_short },
@ -207,11 +204,11 @@ static const struct field_converter field_converter[LAB_FIELD_COUNT] = {
[LAB_FIELD_TITLE] = { 'T', field_set_title },
[LAB_FIELD_TITLE_SHORT] = { 't', field_set_title_short },
/* fmt_char can never be matched so prevents LAB_FIELD_CUSTOM recursion */
[LAB_FIELD_CUSTOM] = { '\0', field_set_custom },
[LAB_FIELD_CUSTOM] = { '\0', osd_field_set_custom },
};
static void
field_set_custom(struct buf *buf, struct view *view, const char *format)
void
osd_field_set_custom(struct buf *buf, struct view *view, const char *format)
{
if (!format) {
wlr_log(WLR_ERROR, "Missing format for custom window switcher field");

30
src/osd/osd-thumbnail.c
View file

@ -7,6 +7,7 @@
#include "config/rcxml.h"
#include "common/array.h"
#include "common/box.h"
#include "common/buf.h"
#include "common/lab-scene-rect.h"
#include "common/list.h"
#include "labwc.h"
@ -20,8 +21,8 @@
struct osd_thumbnail_item {
struct osd_item base;
struct scaled_font_buffer *normal_title;
struct scaled_font_buffer *active_title;
struct scaled_font_buffer *normal_label;
struct scaled_font_buffer *active_label;
struct lab_scene_rect *active_bg;
};
@ -89,16 +90,19 @@ render_thumb(struct output *output, struct view *view)
}
static struct scaled_font_buffer *
create_title(struct wlr_scene_tree *parent,
create_label(struct wlr_scene_tree *parent, struct view *view,
struct window_switcher_thumbnail_theme *switcher_theme,
const char *title, const float *title_color,
const float *bg_color, int y)
const float *text_color, const float *bg_color, int y)
{
struct buf buf = BUF_INIT;
osd_field_set_custom(&buf, view,
rc.window_switcher.thumbnail_label_format);
struct scaled_font_buffer *buffer =
scaled_font_buffer_create(parent);
scaled_font_buffer_update(buffer, title,
scaled_font_buffer_update(buffer, buf.data,
switcher_theme->item_width - 2 * switcher_theme->item_padding,
&rc.font_osd, title_color, bg_color);
&rc.font_osd, text_color, bg_color);
buf_reset(&buf);
wlr_scene_node_set_position(&buffer->scene_buffer->node,
(switcher_theme->item_width - buffer->width) / 2, y);
return buffer;
@ -163,11 +167,11 @@ create_item_scene(struct wlr_scene_tree *parent, struct view *view,
}
/* title */
item->normal_title = create_title(tree, switcher_theme,
view->title, theme->osd_label_text_color,
item->normal_label = create_label(tree, view,
switcher_theme, theme->osd_label_text_color,
theme->osd_bg_color, title_y);
item->active_title = create_title(tree, switcher_theme,
view->title, theme->osd_label_text_color,
item->active_label = create_label(tree, view,
switcher_theme, theme->osd_label_text_color,
switcher_theme->item_active_bg_color, title_y);
/* icon */
@ -277,9 +281,9 @@ osd_thumbnail_update(struct output *output)
bool active = (item->base.view == output->server->osd_state.cycle_view);
wlr_scene_node_set_enabled(&item->active_bg->tree->node, active);
wlr_scene_node_set_enabled(
&item->active_title->scene_buffer->node, active);
&item->active_label->scene_buffer->node, active);
wlr_scene_node_set_enabled(
&item->normal_title->scene_buffer->node, !active);
&item->normal_label->scene_buffer->node, !active);
}
}