mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-10-29 05:40:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

osd: suppress errors with null window switcher fields

Browse source 
Fixes a regression in 75eb370 that emits errors like:

[../labwc/src/common/scaled-font-buffer.c:26] font_buffer_create() failed

...when osd_field_get_content() doesn't set non-null text.
This commit is contained in:
tokyo4j 2025-04-23 04:27:19 +09:00 • committed by Consolatis
parent 579dca9768
commit 44295c0c13
1 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/osd.c
View file

@ -11,6 +11,7 @@
#include "common/scaled-icon-buffer.h"
#include "common/scaled-rect-buffer.h"
#include "common/scene-helpers.h"
#include "common/string-helpers.h"
#include "config/rcxml.h"
#include "labwc.h"
#include "node.h"
@ -369,16 +370,23 @@ create_osd_scene(struct output *output, struct wl_array *views)
buf_clear(&buf);
osd_field_get_content(field, &buf, *view);
struct scaled_font_buffer *font_buffer =
scaled_font_buffer_create(item_root);
scaled_font_buffer_update(font_buffer, buf.data, field_width,
&rc.font_osd, text_color, bg_color);
node = &font_buffer->scene_buffer->node;
height = font_height(&rc.font_osd);
if (!string_null_or_empty(buf.data)) {
struct scaled_font_buffer *font_buffer =
scaled_font_buffer_create(item_root);
scaled_font_buffer_update(font_buffer,
buf.data, field_width,
&rc.font_osd, text_color, bg_color);
node = &font_buffer->scene_buffer->node;
height = font_height(&rc.font_osd);
}
}
wlr_scene_node_set_position(node, x,
y + (theme->osd_window_switcher_item_height - height) / 2);
if (node) {
int item_height =
theme->osd_window_switcher_item_height;
wlr_scene_node_set_position(node,
x, y + (item_height - height) / 2);
}
x += field_width + theme->osd_window_switcher_item_padding_x;
}