Fixed icon alignments

Some of the icons in the Bookmarks list and lookup results were misaligned.

4 files changed, 45 insertions, 12 deletions

diff --git a/src/ui/lookupwidget.c b/src/ui/lookupwidget.c
index 3eafd4bd..254aad93 100644
--- a/src/ui/lookupwidget.c
+++ b/src/ui/lookupwidget.c
@@ -127,10 +127,11 @@ static void draw_LookupItem_(iLookupItem *d, iPaint *p, iRect rect, const iListW
         pos.y = bottom_Rect(rect) - lineHeight_Text(d->font);
     }
     if (!isEmpty_String(&d->icon)) {
-        const iRect iconRect = { pos, init_I2(gap_UI * 5, height_Rect(rect)) };
-        const iInt2 iconSize = measureRange_Text(d->font, range_String(&d->icon));
+        const iRect iconRect = { init_I2(pos.x, top_Rect(rect)),
+                                 init_I2(gap_UI * 5, height_Rect(rect)) };
+        const iRect iconVis = visualBounds_Text(d->font, range_String(&d->icon));
         drawRange_Text(d->font,
-                       addX_I2(pos, width_Rect(iconRect) / 2 - iconSize.x / 2),
+                       sub_I2(mid_Rect(iconRect), mid_Rect(iconVis)),
                        fg,
                        range_String(&d->icon));
         pos.x += width_Rect(iconRect) + gap_UI * 3 / 2;
@@ -301,7 +302,7 @@ static void searchIdentities_LookupJob_(iLookupJob *d) {
         iLookupResult *res = new_LookupResult();
         res->type = identity_LookupResultType;
         res->relevance = identityRelevance_LookupJob_(d, identity);
-        res->icon = identity->icon;
+        res->icon = 0x1f464; /* identity->icon; */
         iString *cn = subject_TlsCertificate(identity->cert);
         set_String(&res->label, cn);
         delete_String(cn);
@@ -701,6 +702,12 @@ static iBool processEvent_LookupWidget_(iLookupWidget *d, const SDL_Event *ev) {
         }
         return iTrue;
     }
+    if (ev->type == SDL_MOUSEMOTION) {
+        if (contains_Widget(w, init_I2(ev->motion.x, ev->motion.y))) {
+            setCursor_Window(get_Window(), SDL_SYSTEM_CURSOR_HAND);
+        }
+        return iFalse;
+    }
     if (ev->type == SDL_KEYDOWN) {
         const int mods = keyMods_Sym(ev->key.keysym.mod);
         const int key = ev->key.keysym.sym;
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 950db596..395138bb 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -1680,7 +1680,7 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
                                : uiText_ColorId;
         iString str;
         init_String(&str);
-        appendChar_String(&str, d->icon ? d->icon : 0x1f588);
+        appendChar_String(&str, d->icon ? d->icon : 0x1f588);        
         const iRect iconArea = { addX_I2(pos, gap_UI),
                                  init_I2(1.75f * lineHeight_Text(font), itemHeight) };
         drawCentered_Text(font,
@@ -1694,9 +1694,13 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
         deinit_String(&str);
         const iInt2 textPos = addY_I2(topRight_Rect(iconArea), (itemHeight - lineHeight_Text(font)) / 2);
         drawRange_Text(font, textPos, fg, range_String(&d->label));
+        const int metaFont = default_FontId;
+        const int metaIconWidth = 4.5f * gap_UI;
         const iInt2 metaPos =
-            init_I2(right_Rect(itemRect) - advanceRange_Text(font, range_String(&d->meta)).x -
-                        2 * gap_UI - (scrollBarWidth ? scrollBarWidth - gap_UI : 0),
+            init_I2(right_Rect(itemRect) -
+                        length_String(&d->meta) *
+                            metaIconWidth
+                        - 2 * gap_UI - (blankWidth ? blankWidth - 1.5f * gap_UI : (gap_UI / 2)),
                     textPos.y);
         fillRect_Paint(p,
                        init_Rect(metaPos.x,
@@ -1704,10 +1708,22 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
                                  right_Rect(itemRect) - metaPos.x,
                                  height_Rect(itemRect)),
                        bg);
-        drawRange_Text(font,
-                       metaPos,
-                       isHover && isPressing ? fg : uiTextCaution_ColorId,
-                       range_String(&d->meta));
+        iInt2 mpos = metaPos;
+        iStringConstIterator iter;
+        init_StringConstIterator(&iter, &d->meta);
+        iRangecc range = { cstr_String(&d->meta), iter.pos };
+        while (iter.value) {
+            next_StringConstIterator(&iter);
+            range.end = iter.pos;
+            iRect iconArea = { mpos, init_I2(metaIconWidth, lineHeight_Text(metaFont)) };
+            iRect visBounds = visualBounds_Text(metaFont, range);
+            drawRange_Text(metaFont,
+                           sub_I2(mid_Rect(iconArea), mid_Rect(visBounds)),
+                           isHover && isPressing ? fg : uiTextCaution_ColorId,
+                           range);
+            mpos.x += metaIconWidth;
+            range.start = range.end;            
+        }        
     }
     else if (sidebar->mode == history_SidebarMode) {
         iBeginCollect();
diff --git a/src/ui/text.c b/src/ui/text.c
index d35b470c..54b0a9da 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -1237,7 +1237,7 @@ iInt2 advanceN_Text(int fontId, const char *text, size_t n) {
     return init_I2(advance, lineHeight_Text(fontId));
 }
 
-static void drawBounded_Text_(int fontId, iInt2 pos, int xposBound, int color, iRangecc text) {
+static void drawBoundedN_Text_(int fontId, iInt2 pos, int xposBound, int color, iRangecc text, size_t maxLen) {
     iText *d    = &text_;
     iFont *font = font_Text_(fontId);
     const iColor clr = get_Color(color & mask_ColorId);
@@ -1248,11 +1248,16 @@ static void drawBounded_Text_(int fontId, iInt2 pos, int xposBound, int color, i
                                    (color & fillBackground_ColorId ? fillBackground_RunMode : 0) |
                                    runFlagsFromId_(fontId),
                            .text            = text,
+                           .maxLen          = maxLen,                           
                            .pos             = pos,
                            .xposLayoutBound = xposBound,
                            .color           = color & mask_ColorId });
 }
 
+static void drawBounded_Text_(int fontId, iInt2 pos, int xposBound, int color, iRangecc text) {
+    drawBoundedN_Text_(fontId, pos, xposBound, color, text, 0);
+}
+
 static void draw_Text_(int fontId, iInt2 pos, int color, iRangecc text) {
     drawBounded_Text_(fontId, pos, 0, color, text);
 }
@@ -1295,6 +1300,10 @@ void drawRange_Text(int fontId, iInt2 pos, int color, iRangecc text) {
     draw_Text_(fontId, pos, color, text);
 }
 
+void drawRangeN_Text(int fontId, iInt2 pos, int color, iRangecc text, size_t maxChars) {
+    drawBoundedN_Text_(fontId, pos, 0, color, text, maxChars);
+}
+
 iInt2 advanceWrapRange_Text(int fontId, int maxWidth, iRangecc text) {
     iInt2 size = zero_I2();
     const char *endp;
diff --git a/src/ui/text.h b/src/ui/text.h
index 1bb60e8b..3dc38238 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -162,6 +162,7 @@ void    drawAlign_Text      (int fontId, iInt2 pos, int color, enum iAlignment a
 void    drawCentered_Text   (int fontId, iRect rect, iBool alignVisual, int color, const char *text, ...);
 void    drawString_Text     (int fontId, iInt2 pos, int color, const iString *text);
 void    drawRange_Text      (int fontId, iInt2 pos, int color, iRangecc text);
+void    drawRangeN_Text     (int fontId, iInt2 pos, int color, iRangecc text, size_t maxLen);
 void    drawBoundRange_Text (int fontId, iInt2 pos, int boundWidth, int color, iRangecc text); /* bound does not wrap */
 int     drawWrapRange_Text  (int fontId, iInt2 pos, int maxWidth, int color, iRangecc text); /* returns new Y */