Fixed issues with tab button labels

Fixed issue with very short text not being truncated at all. A short truncated label will now just show the icon, if one is set.

The tab close buttons don't appear if the buttons are too small.

2 files changed, 16 insertions, 3 deletions

diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index aac77572..746e03e0 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1007,17 +1007,26 @@ static void updateWindowTitle_DocumentWidget_(const iDocumentWidget *d) {
             prependCStr_String(text, escape_Color(uiIcon_ColorId));
         }
         const int width = measureRange_Text(font, range_String(text)).advance.x;
-        if (width <= avail ||
-            isEmpty_StringArray(title)) {
+        const int ellipsisWidth = measure_Text(font, "...").advance.x;
+        setTextColor_LabelWidget(tabButton, none_ColorId);
+        iWidget *tabCloseButton = child_Widget(as_Widget(tabButton), 0);
+        setFlags_Widget(tabCloseButton, visibleOnParentHover_WidgetFlag,
+                        avail > width_Widget(tabCloseButton));
+        if (width <= avail || isEmpty_StringArray(title)) {
             updateText_LabelWidget(tabButton, text);
             break;
         }
         if (size_StringArray(title) == 1) {
             /* Just truncate to fit. */
+            if (siteIcon && avail <= 4 * ellipsisWidth) {
+                updateText_LabelWidget(tabButton, collect_String(newUnicodeN_String(&siteIcon, 1)));
+                setTextColor_LabelWidget(tabButton, uiIcon_ColorId);
+                break;
+            }
             const char *endPos;
             tryAdvanceNoWrap_Text(font,
                                   range_String(text),
-                                  avail - measure_Text(font, "...").advance.x,
+                                  avail - ellipsisWidth,
                                   &endPos);
             updateText_LabelWidget(
                 tabButton,
diff --git a/src/ui/text.c b/src/ui/text.c
index 91ff137a..977cac9c 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -1871,6 +1871,10 @@ iInt2 tryAdvance_Text(int fontId, iRangecc text, int width, const char **endPos)
 }
 
 iInt2 tryAdvanceNoWrap_Text(int fontId, iRangecc text, int width, const char **endPos) {
+    if (width <= 1) {
+        *endPos = text.start;
+        return zero_I2();
+    }
     /* "NoWrap" means words aren't wrapped; the line is broken at nearest character. */
     iWrapText wrap = { .mode     = anyCharacter_WrapTextMode,
                        .text     = text,