Right/center-aligned text; fixed menu shortcuts

5 files changed, 36 insertions, 18 deletions

diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index f24e2573..c9ac0b60 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -193,16 +193,20 @@ static void draw_LabelWidget_(const iLabelWidget *d) {
             iString str;
             init_String(&str);
             keyStr_LabelWidget_(d, &str);
-            draw_Text(uiShortcuts_FontId, negX_I2(add_I2(topRight_Rect(bounds), negX_I2(padding_()))),
-                      flags & pressed_WidgetFlag ? fg : cyan_ColorId, cstr_String(&str));
+            drawAlign_Text(uiShortcuts_FontId,
+                           add_I2(topRight_Rect(bounds), negX_I2(padding_())),
+                           flags & pressed_WidgetFlag ? fg : cyan_ColorId,
+                           right_Alignment,
+                           cstr_String(&str));
             deinit_String(&str);
         }
     }
     else if (flags & alignRight_WidgetFlag) {
-        draw_Text(
+        drawAlign_Text(
             d->font,
-            mul_I2(init_I2(-1, 1), add_I2(topRight_Rect(bounds), negX_I2(padding_()))),
+            add_I2(topRight_Rect(bounds), negX_I2(padding_())),
             fg,
+            right_Alignment,
             cstr_String(&d->label));
     }
     else {
diff --git a/src/ui/text.c b/src/ui/text.c
index dd8b4323..26bb9599 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -574,7 +574,7 @@ static void draw_Text_(int fontId, iInt2 pos, int color, iRangecc text) {
               NULL);
 }
 
-void draw_Text(int fontId, iInt2 pos, int color, const char *text, ...) {
+void drawAlign_Text(int fontId, iInt2 pos, int color, enum iAlignment align, const char *text, ...) {
     iBlock chars;
     init_Block(&chars, 0); {
         va_list args;
@@ -582,17 +582,24 @@ void draw_Text(int fontId, iInt2 pos, int color, const char *text, ...) {
         vprintf_Block(&chars, text, args);
         va_end(args);
     }
-#if 0
-    /* BUG: A long text string may have a negative X but still be meant to the left-aligned. */
-    if (pos.x < 0) {
-        /* Right-aligned. */
-        pos.x = -pos.x - measure_Text(fontId, cstr_Block(&chars)).x;
+    if (align == center_Alignment) {
+        pos.x -= measure_Text(fontId, cstr_Block(&chars)).x / 2;
     }
-    if (pos.y < 0) {
-        /* Bottom-aligned. */
-        pos.y = -pos.y - lineHeight_Text(fontId);
+    else if (align == right_Alignment) {
+        pos.x -= measure_Text(fontId, cstr_Block(&chars)).x;
+    }
+    draw_Text_(fontId, pos, color, (iRangecc){ constBegin_Block(&chars), constEnd_Block(&chars) });
+    deinit_Block(&chars);
+}
+
+void draw_Text(int fontId, iInt2 pos, int color, const char *text, ...) {
+    iBlock chars;
+    init_Block(&chars, 0); {
+        va_list args;
+        va_start(args, text);
+        vprintf_Block(&chars, text, args);
+        va_end(args);
     }
-#endif
     draw_Text_(fontId, pos, color, (iRangecc){ constBegin_Block(&chars), constEnd_Block(&chars) });
     deinit_Block(&chars);
 }
diff --git a/src/ui/text.h b/src/ui/text.h
index be95e948..982218eb 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -49,9 +49,16 @@ iInt2   advanceN_Text       (int fontId, const char *text, size_t n); /* `n` in
 iInt2   advanceRange_Text   (int fontId, iRangecc text);
 iInt2   tryAdvanceRange_Text(int fontId, iRangecc text, int width, const char **endPos);
 
-void    draw_Text           (int fontId, iInt2 pos, int color, const char *text, ...); /* negative pos to switch alignment */
-void    drawString_Text     (int fontId, iInt2 pos, int color, const iString *text);
+enum iAlignment {
+    left_Alignment,
+    center_Alignment,
+    right_Alignment,
+};
+
+void    draw_Text           (int fontId, iInt2 pos, int color, const char *text, ...);
+void    drawAlign_Text      (int fontId, iInt2 pos, int color, enum iAlignment align, const char *text, ...);
 void    drawCentered_Text   (int fontId, iRect rect, int color, const char *text, ...);
+void    drawString_Text     (int fontId, iInt2 pos, int color, const iString *text);
 
 SDL_Texture *   glyphCache_Text     (void);
 
diff --git a/src/ui/util.c b/src/ui/util.c
index 8fc7f9e3..c468ba2b 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -175,7 +175,7 @@ iWidget *makeMenu_Widget(iWidget *parent, const iMenuItem *items, size_t n) {
         const iMenuItem *item = &items[i];
         if (equal_CStr(item->label, "---")) {
             iWidget *sep = addChild_Widget(menu, iClob(new_Widget()));
-            setBackgroundColor_Widget(sep, gray50_ColorId);
+            setBackgroundColor_Widget(sep, black_ColorId);
             sep->rect.size.y = gap_UI / 3;
             setFlags_Widget(sep, hover_WidgetFlag | fixedHeight_WidgetFlag, iTrue);
         }
diff --git a/src/ui/widget.c b/src/ui/widget.c
index e83532d4..bbd5f465 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -405,7 +405,7 @@ void draw_Widget(const iWidget *d) {
             fillRect_Paint(&p, rect, d->bgColor);
         }
         if (d->frameColor >= 0) {
-            drawRect_Paint(&p, rect, d->frameColor);
+            drawRectThickness_Paint(&p, rect, gap_UI / 4, d->frameColor);
         }
     }
     iConstForEach(ObjectList, i, d->children) {