Tight mode for Query/Feeds indicator

19 files changed, 33 insertions, 8 deletions

diff --git a/po/en.po b/po/en.po
index 8fe6b96d..bd7e97bf 100644
--- a/po/en.po
+++ b/po/en.po
@@ -392,6 +392,9 @@ msgstr "Find text on page"
 msgid "status.query"
 msgstr "Search Query"
 
+msgid "status.query.tight"
+msgstr "Query"
+
 msgid "status.feeds"
 msgstr "Updating Feeds"
 
@@ -1228,6 +1231,9 @@ msgstr "On Light"
 msgid "prefs.userfont"
 msgstr "Symbol font:"
 
+msgid "hint.prefs.userfont"
+msgstr "path of a TrueType font"
+
 msgid "prefs.linewidth"
 msgstr "Line width:"
 
diff --git a/res/lang/de.bin b/res/lang/de.bin
index b89c8b0f..95d172cc 100644
--- a/res/lang/de.bin
+++ b/res/lang/de.bin
diff --git a/res/lang/en.bin b/res/lang/en.bin
index 0ac42d88..d5cb1c2c 100644
--- a/res/lang/en.bin
+++ b/res/lang/en.bin
diff --git a/res/lang/es.bin b/res/lang/es.bin
index 8f3940f1..4b567393 100644
--- a/res/lang/es.bin
+++ b/res/lang/es.bin
diff --git a/res/lang/fi.bin b/res/lang/fi.bin
index d19dc0e8..d1ab756b 100644
--- a/res/lang/fi.bin
+++ b/res/lang/fi.bin
diff --git a/res/lang/fr.bin b/res/lang/fr.bin
index 0b78f3b7..5561640c 100644
--- a/res/lang/fr.bin
+++ b/res/lang/fr.bin
diff --git a/res/lang/ia.bin b/res/lang/ia.bin
index e6590afc..da272056 100644
--- a/res/lang/ia.bin
+++ b/res/lang/ia.bin
diff --git a/res/lang/ie.bin b/res/lang/ie.bin
index f852ba0e..3d77d90e 100644
--- a/res/lang/ie.bin
+++ b/res/lang/ie.bin
diff --git a/res/lang/pl.bin b/res/lang/pl.bin
index 9f42024c..c09c6bef 100644
--- a/res/lang/pl.bin
+++ b/res/lang/pl.bin
diff --git a/res/lang/ru.bin b/res/lang/ru.bin
index 5c9e3488..e344e992 100644
--- a/res/lang/ru.bin
+++ b/res/lang/ru.bin
diff --git a/res/lang/sr.bin b/res/lang/sr.bin
index f4239f1f..6a860e79 100644
--- a/res/lang/sr.bin
+++ b/res/lang/sr.bin
diff --git a/res/lang/tok.bin b/res/lang/tok.bin
index 1a6b5baf..27bfdb49 100644
--- a/res/lang/tok.bin
+++ b/res/lang/tok.bin
diff --git a/res/lang/zh_Hans.bin b/res/lang/zh_Hans.bin
index b155036d..077ba1e3 100644
--- a/res/lang/zh_Hans.bin
+++ b/res/lang/zh_Hans.bin
diff --git a/res/lang/zh_Hant.bin b/res/lang/zh_Hant.bin
index 57ce2d83..4d9a984b 100644
--- a/res/lang/zh_Hant.bin
+++ b/res/lang/zh_Hant.bin
diff --git a/src/app.c b/src/app.c
index 71cff954..1ea33dd4 100644
--- a/src/app.c
+++ b/src/app.c
@@ -2503,11 +2503,15 @@ iBool handleCommand_App(const char *cmd) {
         return iTrue;
     }
     else if (equal_Command(cmd, "feeds.update.started")) {
-        showCollapsed_Widget(findWidget_App("feeds.progress"), iTrue);
+        iAnyObject *prog = findWidget_Root("feeds.progress");
+        const iWidget *navBar = findWidget_Root("navbar");
+        updateTextAndResizeWidthCStr_LabelWidget(
+            prog, flags_Widget(navBar) & tight_WidgetFlag ? "\u2605" : "\u2605 ${status.feeds}");
+        showCollapsed_Widget(prog, iTrue);
         return iFalse;
     }
     else if (equal_Command(cmd, "feeds.update.finished")) {
-        showCollapsed_Widget(findWidget_App("feeds.progress"), iFalse);
+        showCollapsed_Widget(findWidget_Root("feeds.progress"), iFalse);
         refreshFinished_Feeds();
         postRefresh_App();
         return iFalse;
diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index ed023961..febaa15b 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -495,6 +495,11 @@ void updateTextCStr_LabelWidget(iLabelWidget *d, const char *text) {
     refresh_Widget(&d->widget);
 }
 
+void updateTextAndResizeWidthCStr_LabelWidget(iLabelWidget *d, const char *text) {
+    updateTextCStr_LabelWidget(d, text);
+    d->widget.rect.size.x = defaultSize_LabelWidget(d).x;
+}
+
 void setTextCStr_LabelWidget(iLabelWidget *d, const char *text) {
     setCStr_String(&d->label, text);
     set_String(&d->srcLabel, &d->label);
diff --git a/src/ui/labelwidget.h b/src/ui/labelwidget.h
index e38a1dc8..25cde95c 100644
--- a/src/ui/labelwidget.h
+++ b/src/ui/labelwidget.h
@@ -43,6 +43,8 @@ void    updateSize_LabelWidget      (iLabelWidget *);
 void    updateText_LabelWidget      (iLabelWidget *, const iString *text); /* not resized */
 void    updateTextCStr_LabelWidget  (iLabelWidget *, const char *text); /* not resized */
 
+void    updateTextAndResizeWidthCStr_LabelWidget    (iLabelWidget *, const char *text);
+
 iInt2           defaultSize_LabelWidget (const iLabelWidget *);
 int             font_LabelWidget        (const iLabelWidget *);
 const iString * text_LabelWidget        (const iLabelWidget *);
diff --git a/src/ui/root.c b/src/ui/root.c
index 15548e74..23a7d670 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -551,9 +551,15 @@ static void updateUrlInputContentPadding_(iWidget *navBar) {
 }
 
 static void showSearchQueryIndicator_(iBool show) {
+    iWidget *navBar = findWidget_Root("navbar");
     iWidget *indicator = findWidget_App("input.indicator.search");
+    updateTextCStr_LabelWidget((iLabelWidget *) indicator,
+                               flags_Widget(navBar) & tight_WidgetFlag
+                                   ? "${status.query.tight} " return_Icon
+                                   : "${status.query} " return_Icon);
+    indicator->rect.size.x = defaultSize_LabelWidget((iLabelWidget *) indicator).x; /* don't touch height */
     showCollapsed_Widget(indicator, show);
-    updateUrlInputContentPadding_(findWidget_Root("navbar"));
+    updateUrlInputContentPadding_(navBar);
 }
 
 static int navBarAvailableSpace_(iWidget *navBar) {
@@ -1048,9 +1054,9 @@ void createUserInterface_Root(iRoot *d) {
                                      resizeHeightOfChildren_WidgetFlag |
                                      moveToParentRightEdge_WidgetFlag);
             /* Feeds refresh indicator is inside the input field. */ {
-                iLabelWidget *queryInd =
-                    new_LabelWidget(uiTextAction_ColorEscape "${status.query} " return_Icon, NULL);
+                iLabelWidget *queryInd = new_LabelWidget("${status.query} " return_Icon, NULL);
                 setId_Widget(as_Widget(queryInd), "input.indicator.search");
+                setTextColor_LabelWidget(queryInd, uiTextAction_ColorId);
                 setBackgroundColor_Widget(as_Widget(queryInd), uiBackground_ColorId);
                 setFrameColor_Widget(as_Widget(queryInd), uiTextAction_ColorId);
                 setAlignVisually_LabelWidget(queryInd, iTrue);
@@ -1060,9 +1066,9 @@ void createUserInterface_Root(iRoot *d) {
                                      collapse_WidgetFlag | hidden_WidgetFlag);
             }
             /* Feeds refresh indicator is inside the input field. */ {
-                iLabelWidget *fprog = new_LabelWidget(uiTextCaution_ColorEscape
-                                                      "\u2605 ${status.feeds}", NULL);
+                iLabelWidget *fprog = new_LabelWidget("", NULL);
                 setId_Widget(as_Widget(fprog), "feeds.progress");
+                setTextColor_LabelWidget(fprog, uiTextCaution_ColorId);
                 setBackgroundColor_Widget(as_Widget(fprog), uiBackground_ColorId);
                 setAlignVisually_LabelWidget(fprog, iTrue);
                 setNoAutoMinHeight_LabelWidget(fprog, iTrue);
diff --git a/src/ui/util.c b/src/ui/util.c
index c4fb8886..6eef544b 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -1789,7 +1789,9 @@ iWidget *makePreferences_Widget(void) {
                 updateSize_LabelWidget((iLabelWidget *) tog);
             }
             addChildFlags_Widget(values, iClob(boldLink), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
-            addPrefsInputWithHeading_(headings, values, "prefs.userfont", iClob(new_InputWidget(0)));
+            iInputWidget *customFont = new_InputWidget(0);
+            setHint_InputWidget(customFont, "${hint.prefs.userfont}");
+            addPrefsInputWithHeading_(headings, values, "prefs.userfont", iClob(customFont));
         }
         makeTwoColumnHeading_("${heading.prefs.paragraph}", headings, values);
         addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.linewidth}")));