Cleanup

4 files changed, 10 insertions, 8 deletions

diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 6e10ff54..3e81b418 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1150,7 +1150,7 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         return iTrue;
     }
     else if (equal_Command(cmd, "valueinput.cancelled") &&
-             cmp_String(string_Command(cmd, "id"), "document.input.submit") == 0) {
+             equal_Rangecc(range_Command(cmd, "id"), "document.input.submit")) {
         postCommand_App("navigate.back");
         return iTrue;
     }
diff --git a/src/ui/lookupwidget.c b/src/ui/lookupwidget.c
index ef262b46..b7de5872 100644
--- a/src/ui/lookupwidget.c
+++ b/src/ui/lookupwidget.c
@@ -570,7 +570,8 @@ static iBool processEvent_LookupWidget_(iLookupWidget *d, const SDL_Event *ev) {
         presentResults_LookupWidget_(d);
         return iTrue;
     }
-    if (isResize_UserEvent(ev)) {
+    if (isResize_UserEvent(ev) || (equal_Command(cmd, "layout.changed") &&
+                                   equal_Rangecc(range_Command(cmd, "id"), "navbar"))) {
         /* Position the lookup popup under the URL bar. */ {
             setSize_Widget(w, init_I2(width_Widget(findWidget_App("url")),
                                       get_Window()->root->rect.size.y / 2));
@@ -580,7 +581,7 @@ static iBool processEvent_LookupWidget_(iLookupWidget *d, const SDL_Event *ev) {
         updateVisible_ListWidget(d->list);
         invalidate_ListWidget(d->list);
     }
-    if (equal_Command(cmd, "input.ended") && !cmp_String(string_Command(cmd, "id"), "url") &&
+    if (equal_Command(cmd, "input.ended") && equal_Rangecc(range_Command(cmd, "id"), "url") &&
         !isFocused_Widget(w)) {
         setFlags_Widget(w, hidden_WidgetFlag, iTrue);
     }
diff --git a/src/ui/util.c b/src/ui/util.c
index 6969599b..9aa634bc 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -304,8 +304,7 @@ static iBool tabSwitcher_(iWidget *tabs, const char *cmd) {
     if (equal_Command(cmd, "tabs.switch")) {
         iWidget *target = pointerLabel_Command(cmd, "page");
         if (!target) {
-            const iString *id = string_Command(cmd, "id");
-            target = findChild_Widget(tabs, cstr_String(id));
+            target = findChild_Widget(tabs, cstr_Rangecc(range_Command(cmd, "id")));
         }
         if (!target) return iFalse;
         if (flags_Widget(target) & focusable_WidgetFlag) {
diff --git a/src/ui/window.c b/src/ui/window.c
index 8d76c68b..ea4d81ec 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -77,7 +77,7 @@ static iBool handleRootCommands_(iWidget *root, const char *cmd) {
         return iTrue;
     }
     else if (equal_Command(cmd, "focus.set")) {
-        setFocus_Widget(findWidget_App(cstr_String(string_Command(cmd, "id"))));
+        setFocus_Widget(findWidget_App(cstr_Rangecc(range_Command(cmd, "id"))));
         return iTrue;
     }
     else if (handleCommand_App(cmd)) {
@@ -204,6 +204,7 @@ static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
         }
         arrange_Widget(navBar);
         refresh_Widget(navBar);
+        postCommand_Widget(navBar, "layout.changed id:navbar");
         return iFalse;
     }
     else if (equal_Command(cmd, "input.edited")) {
@@ -289,7 +290,7 @@ static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
 
 static iBool handleSearchBarCommands_(iWidget *searchBar, const char *cmd) {
     if (equal_Command(cmd, "input.ended") &&
-        cmp_String(string_Command(cmd, "id"), "find.input") == 0) {
+        equal_Rangecc(range_Command(cmd, "id"), "find.input")) {
         iInputWidget *input = findChild_Widget(searchBar, "find.input");
         if (arg_Command(cmd) && argLabel_Command(cmd, "enter") && isVisible_Widget(input)) {
             postCommand_App("find.next");
@@ -338,7 +339,8 @@ static void setupUserInterface_Window(iWindow *d) {
     /* Navigation bar. */ {
         iWidget *navBar = new_Widget();
         setId_Widget(navBar, "navbar");
-        setPadding_Widget(navBar, gap_UI / 2, 0, gap_UI / 2, 0);
+        /*setPadding_Widget(navBar, gap_UI / 2, 0, gap_UI / 2, 0);*/
+        setPadding_Widget(navBar, gap_UI, gap_UI / 2, gap_UI, gap_UI / 2);
         setFlags_Widget(navBar,
                         arrangeHeight_WidgetFlag | resizeChildren_WidgetFlag |
                             arrangeHorizontal_WidgetFlag,