Fixed switching focus with Tab key

Focus should go from URL bar to lookup results, and only then to the find bar.

2 files changed, 26 insertions, 4 deletions

diff --git a/src/ui/widget.c b/src/ui/widget.c
index c8db73dc..d3f28b08 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -218,6 +218,16 @@ iRect innerBounds_Widget(const iWidget *d) {
     return ib;
 }
 
+static size_t numArrangedChildren_Widget_(const iWidget *d) {
+    size_t count = 0;
+    iConstForEach(ObjectList, i, d->children) {
+        if (~flags_Widget(i.object) & fixedPosition_WidgetFlag) {
+            count++;
+        }
+    }
+    return count;
+}
+
 void arrange_Widget(iWidget *d) {
     if (isCollapsed_Widget_(d)) {
         setFlags_Widget(d, wasCollapsed_WidgetFlag, iTrue);
@@ -237,7 +247,10 @@ void arrange_Widget(iWidget *d) {
         return;
     }
     /* Resize children to fill the parent widget. */
-    const size_t childCount = size_ObjectList(d->children);
+    const size_t childCount = numArrangedChildren_Widget_(d);
+    if (childCount == 0) {
+        return;
+    }
     if (d->flags & resizeChildren_WidgetFlag) {
         const iInt2 dirs = init_I2((d->flags & resizeWidthOfChildren_WidgetFlag) != 0,
                                    (d->flags & resizeHeightOfChildren_WidgetFlag) != 0);
@@ -272,6 +285,9 @@ void arrange_Widget(iWidget *d) {
             iInt2 avail = innerRect_Widget_(d).size;
             iConstForEach(ObjectList, i, d->children) {
                 const iWidget *child = constAs_Widget(i.object);
+                if (child->flags & fixedPosition_WidgetFlag) {
+                    continue;
+                }
                 if (~child->flags & expand_WidgetFlag) {
                     subv_I2(&avail, child->rect.size);
                 }
@@ -280,6 +296,9 @@ void arrange_Widget(iWidget *d) {
             iForEach(ObjectList, j, d->children) {
                 iWidget *child = as_Widget(j.object);
                 if (isCollapsed_Widget_(child)) continue;
+                if (child->flags & fixedPosition_WidgetFlag) {
+                    continue;
+                }
                 if (child->flags & expand_WidgetFlag) {
                     if (d->flags & arrangeHorizontal_WidgetFlag) {
                         if (dirs.x) setWidth_Widget_(child, avail.x);
diff --git a/src/ui/window.c b/src/ui/window.c
index 1eb0161b..87ca2614 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -404,6 +404,10 @@ static void setupUserInterface_Window(iWindow *d) {
         iSidebarWidget *sidebar = new_SidebarWidget();
         addChildPos_Widget(content, iClob(sidebar), front_WidgetAddPos);
     }
+    /* Lookup results. */ {
+        iLookupWidget *lookup = new_LookupWidget();
+        addChildFlags_Widget(div, iClob(lookup), fixedPosition_WidgetFlag | hidden_WidgetFlag);
+    }
     /* Search bar. */ {
         iWidget *searchBar = new_Widget();
         setId_Widget(searchBar, "search");
@@ -414,7 +418,8 @@ static void setupUserInterface_Window(iWindow *d) {
         addChild_Widget(div, iClob(searchBar));
         setBackgroundColor_Widget(searchBar, uiBackground_ColorId);
         setCommandHandler_Widget(searchBar, handleSearchBarCommands_);
-        addChild_Widget(searchBar, iClob(new_LabelWidget("\U0001f50d Text", 0, 0, NULL)));
+        addChildFlags_Widget(
+            searchBar, iClob(new_LabelWidget("\U0001f50d Text", 0, 0, NULL)), frameless_WidgetFlag);
         iInputWidget *input = new_InputWidget(0);
         setId_Widget(addChildFlags_Widget(searchBar, iClob(input), expand_WidgetFlag),
                      "find.input");
@@ -422,8 +427,6 @@ static void setupUserInterface_Window(iWindow *d) {
         addChild_Widget(searchBar, iClob(newIcon_LabelWidget("  \u2b9d  ", 'g', KMOD_PRIMARY | KMOD_SHIFT, "find.prev")));
         addChild_Widget(searchBar, iClob(newIcon_LabelWidget("\u2a2f", SDLK_ESCAPE, 0, "find.close")));
     }
-    iLookupWidget *lookup = new_LookupWidget();
-    addChildFlags_Widget(d->root, iClob(lookup), fixedPosition_WidgetFlag | hidden_WidgetFlag);
     iWidget *tabsMenu = makeMenu_Widget(d->root,
                                         (iMenuItem[]){
                                             { "Close Tab", 0, 0, "tabs.close" },