Mobile: Show identity name in toolbar

Shuffled the widget flags a bit to make room for a new one.

8 files changed, 47 insertions, 8 deletions

diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index 09c5812b..46ef5d1f 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -45,6 +45,7 @@ struct Impl_LabelWidget {
         uint8_t alignVisual     : 1; /* align according to visible bounds, not font metrics */
         uint8_t noAutoMinHeight : 1; /* minimum height is not set automatically */
         uint8_t drawAsOutline   : 1; /* draw as outline, filled with background color */
+        uint8_t noTopFrame      : 1;
     } flags;
 };
 
@@ -290,7 +291,7 @@ static void draw_LabelWidget_(const iLabelWidget *d) {
             };
             drawLines_Paint(&p, points + 2, 3, frame2);
             drawLines_Paint(
-                &p, points, !isHover && flags & noTopFrame_WidgetFlag ? 2 : 3, frame);
+                &p, points, !isHover && flags & d->flags.noTopFrame ? 2 : 3, frame);
         }
     }
     setClip_Paint(&p, rect);
@@ -444,6 +445,7 @@ void init_LabelWidget(iLabelWidget *d, const char *label, const char *cmd) {
     d->flags.alignVisual = iFalse;
     d->flags.noAutoMinHeight = iFalse;
     d->flags.drawAsOutline = iFalse;
+    d->flags.noTopFrame = iFalse;
     updateSize_LabelWidget(d);
     updateKey_LabelWidget_(d); /* could be bound to another key */
 }
@@ -483,6 +485,10 @@ void setNoAutoMinHeight_LabelWidget(iLabelWidget *d, iBool noAutoMinHeight) {
     }
 }
 
+void setNoTopFrame_LabelWidget(iLabelWidget *d, iBool noTopFrame) {
+    d->flags.noTopFrame = noTopFrame;
+}
+
 void setOutline_LabelWidget(iLabelWidget *d, iBool drawAsOutline) {
     d->flags.drawAsOutline = drawAsOutline;
 }
diff --git a/src/ui/labelwidget.h b/src/ui/labelwidget.h
index 25c873fc..f6343273 100644
--- a/src/ui/labelwidget.h
+++ b/src/ui/labelwidget.h
@@ -31,6 +31,7 @@ iDeclareObjectConstructionArgs(LabelWidget, const char *label, const char *comma
 
 void    setAlignVisually_LabelWidget(iLabelWidget *, iBool alignVisual);
 void    setNoAutoMinHeight_LabelWidget(iLabelWidget *, iBool noAutoMinHeight);
+void    setNoTopFrame_LabelWidget   (iLabelWidget *, iBool noTopFrame);
 void    setOutline_LabelWidget      (iLabelWidget *, iBool drawAsOutline);
 void    setFont_LabelWidget         (iLabelWidget *, int fontId);
 void    setTextColor_LabelWidget    (iLabelWidget *, int color);
diff --git a/src/ui/root.c b/src/ui/root.c
index 71f51ef0..9f4aeb7f 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -443,6 +443,10 @@ static void updateNavBarIdentity_(iWidget *navBar) {
         subjectName ? format_CStr(uiTextAction_ColorEscape "%s", cstr_String(subjectName))
                     : "${menu.identity.notactive}");
     setFlags_Widget(as_Widget(idItem), disabled_WidgetFlag, !ident);
+    iLabelWidget *toolName = findWidget_App("toolbar.name");
+    if (toolName) {
+        updateTextCStr_LabelWidget(toolName, subjectName ? cstr_String(subjectName) : "");
+    }
 }
 
 static void updateNavDirButtons_(iWidget *navBar) {
@@ -951,6 +955,19 @@ void updateMetrics_Root(iRoot *d) {
     updatePadding_Root(d);
     arrange_Widget(d->widget);
     updateUrlInputContentPadding_(navBar);
+    /* Position the toolbar identity name label manually. */ {
+        iLabelWidget *idName = findChild_Widget(d->widget, "toolbar.name");
+        if (idName) {
+            const iWidget *idButton = findChild_Widget(d->widget, "toolbar.ident");
+            const int font = defaultSmall_FontId;
+            setFont_LabelWidget(idName, font);
+            setPos_Widget(as_Widget(idName),
+                          windowToLocal_Widget(as_Widget(idName),
+                                addY_I2(bottomLeft_Rect(bounds_Widget(idButton)), -gap_UI * 2)));
+            setFixedSize_Widget(as_Widget(idName), init_I2(width_Widget(idButton),
+                                                           lineHeight_Text(font)));
+        }
+    }
     postRefresh_App();
 }
 
@@ -1284,16 +1301,24 @@ void createUserInterface_Root(iRoot *d) {
                                           iClob(newLargeIcon_LabelWidget(book_Icon, "toolbar.showview arg:-1")),
                                           frameless_WidgetFlag | commandOnClick_WidgetFlag),
                      "toolbar.view");
+        setId_Widget(addChildFlags_Widget(toolBar,
+                                          iClob(new_LabelWidget("", NULL)),
+                                          frameless_WidgetFlag |
+                                          noBackground_WidgetFlag |
+                                          disabled_WidgetFlag |
+                                          fixedPosition_WidgetFlag |
+                                          fixedSize_WidgetFlag |
+                                          ignoreForParentWidth_WidgetFlag |
+                                          ignoreForParentHeight_WidgetFlag),
+                     "toolbar.name");
         iLabelWidget *menuButton = makeMenuButton_LabelWidget(menu_Icon, phoneNavMenuItems_,
                                                               iElemCount(phoneNavMenuItems_));
         setFont_LabelWidget(menuButton, uiLabelLarge_FontId);
         setId_Widget(as_Widget(menuButton), "toolbar.navmenu");
         addChildFlags_Widget(toolBar, iClob(menuButton), frameless_WidgetFlag);
-//        setBackgroundColor_Widget(toolBar, tmBannerBackground_ColorId);
         iForEach(ObjectList, i, children_Widget(toolBar)) {
             iLabelWidget *btn = i.object;
             setFlags_Widget(i.object, noBackground_WidgetFlag, iTrue);
-//            setTextColor_LabelWidget(i.object, tmBannerIcon_ColorId);
         }
         updateToolbarColors_Root(d);
         const iMenuItem items[] = {
diff --git a/src/ui/text.c b/src/ui/text.c
index 8a70e4db..fcd944d6 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -306,6 +306,7 @@ static void initFonts_Text_(iText *d) {
         { &fontSourceSans3Regular_Embedded, uiSize * 1.125f,      1.0f, uiMedium_FontSize },
         { &fontSourceSans3Regular_Embedded, uiSize * 1.333f,      1.0f, uiBig_FontSize },
         { &fontSourceSans3Regular_Embedded, uiSize * 1.666f,      1.0f, uiLarge_FontSize },
+        { &fontSourceSans3Regular_Embedded, uiSize * 0.8f,       1.0f, uiNormal_FontSize },
         /* UI fonts: bold weight */
         { &fontSourceSans3Bold_Embedded,    uiSize,               1.0f, uiNormal_FontSize },
         { &fontSourceSans3Bold_Embedded,    uiSize * 1.125f,      1.0f, uiMedium_FontSize },
diff --git a/src/ui/text.h b/src/ui/text.h
index 64a8352f..dd377247 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -50,6 +50,7 @@ enum iFontId {
     defaultMedium_FontId,
     defaultBig_FontId,
     defaultLarge_FontId,
+    defaultSmall_FontId,
     /* UI fonts: bold weight */
     defaultBold_FontId,
     defaultMediumBold_FontId,
diff --git a/src/ui/util.c b/src/ui/util.c
index f094bdf9..3a9bc400 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -979,8 +979,8 @@ static void addTabPage_Widget_(iWidget *tabs, enum iWidgetAddPos addPos, iWidget
         iClob(newKeyMods_LabelWidget(label, key, kmods, format_CStr("tabs.switch page:%p", page))),
         addPos);
     setFlags_Widget(button, selected_WidgetFlag, isSel);
-    setFlags_Widget(
-        button, noTopFrame_WidgetFlag | commandOnClick_WidgetFlag | expand_WidgetFlag, iTrue);
+    setFlags_Widget(button, commandOnClick_WidgetFlag | expand_WidgetFlag, iTrue);
+    setNoTopFrame_LabelWidget((iLabelWidget *) button, iTrue);
     addChildPos_Widget(pages, page, addPos);
     if (tabCount_Widget(tabs) > 1) {
         setFlags_Widget(buttons, hidden_WidgetFlag, iFalse);
diff --git a/src/ui/widget.c b/src/ui/widget.c
index 85672c04..4e1c9119 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -406,6 +406,11 @@ static void boundsOfChildren_Widget_(const iWidget *d, iRect *bounds_out) {
         iRect childRect = child->rect;
         if (child->flags & ignoreForParentWidth_WidgetFlag) {
             childRect.size.x = 0;
+            childRect.pos.x  = bounds_out->pos.x;
+        }
+        if (child->flags & ignoreForParentHeight_WidgetFlag) {
+            childRect.size.y = 0;
+            childRect.pos.y  = bounds_out->pos.y;
         }
         if (isEmpty_Rect(*bounds_out)) {
             *bounds_out = childRect;
diff --git a/src/ui/widget.h b/src/ui/widget.h
index acb8fa9d..79565483 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -87,7 +87,7 @@ enum iWidgetFlag {
 };
 
 /* 64-bit extended flags */
-#define rightEdgeDraggable_WidgetFlag       iBit64(32)
+#define rightEdgeDraggable_WidgetFlag       iBit64(31)
 #define disabledWhenHidden_WidgetFlag       iBit64(32)
 #define centerHorizontal_WidgetFlag         iBit64(33)
 #define moveToParentLeftEdge_WidgetFlag     iBit64(34)
@@ -103,7 +103,7 @@ enum iWidgetFlag {
 #define drawBackgroundToVerticalSafeArea_WidgetFlag     iBit64(44)
 #define visualOffset_WidgetFlag             iBit64(45)
 #define parentCannotResize_WidgetFlag       iBit64(46)
-#define noTopFrame_WidgetFlag               iBit64(47)
+#define ignoreForParentHeight_WidgetFlag    iBit64(47)
 #define unpadded_WidgetFlag                 iBit64(48) /* ignore parent's padding */
 #define extraPadding_WidgetFlag             iBit64(49)
 #define borderBottom_WidgetFlag             iBit64(50)
@@ -117,7 +117,7 @@ enum iWidgetFlag {
 #define parentCannotResizeHeight_WidgetFlag iBit64(58)
 #define ignoreForParentWidth_WidgetFlag     iBit64(59)
 #define noFadeBackground_WidgetFlag         iBit64(60)
-#define destroyPending_WidgetFlag           iBit64(61) /* TODO: needed? */
+#define destroyPending_WidgetFlag           iBit64(61)
 #define leftEdgeDraggable_WidgetFlag        iBit64(62)
 #define refChildrenOffset_WidgetFlag        iBit64(63) /* visual offset determined by the offset of referenced children */