From: Consolatis <35009135+Consolatis@users.noreply.github.com> Date: Fri, 12 Aug 2022 12:12:31 +0000 (+0200) Subject: src/ssd/ssd_titlebar.c: Completely hide title when running out of space X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=1cdebbc22daa83222e9f5170cf3cb1afc4c4e90e;p=proto%2Flabwc.git src/ssd/ssd_titlebar.c: Completely hide title when running out of space Before this commit the window title could overflow in certain conditions, usually when rapidly resizing. This commit fixes it by completely hiding the corresponding scene node when there is no space available. Reported-by: via IRC --- diff --git a/src/ssd/ssd_titlebar.c b/src/ssd/ssd_titlebar.c index 3ae0b78b..4f5bd9a0 100644 --- a/src/ssd/ssd_titlebar.c +++ b/src/ssd/ssd_titlebar.c @@ -142,6 +142,11 @@ ssd_titlebar_destroy(struct view *view) * .active and .inactive may result in different sizes * of the title (font family/size) or background of * the title (different button/border width). + * + * Both, wlr_scene_node_set_enabled() and wlr_scene_node_set_position() + * check for actual changes and return early if there is no change in state. + * Always using wlr_scene_node_set_enabled(node, true) will thus not cause + * any unnecessary screen damage and makes the code easier to follow. */ static void @@ -167,10 +172,12 @@ ssd_update_title_positions(struct view *view) buffer_height = part->buffer ? part->buffer->height : 0; x = BUTTON_WIDTH; y = (theme->title_height - buffer_height) / 2; + if (title_bg_width <= 0) { - wlr_scene_node_set_position(part->node, x, y); + wlr_scene_node_set_enabled(part->node, false); continue; } + wlr_scene_node_set_enabled(part->node, true); if (theme->window_label_text_justify == LAB_JUSTIFY_CENTER) { if (buffer_width + BUTTON_WIDTH * 2 <= title_bg_width) {