From 0d983d9445af3f1ecee83dc8a19615a14003e1c6 Mon Sep 17 00:00:00 2001
From: Jaakko Keränen <jaakko.keranen@iki.fi>
Date: Sun, 16 May 2021 21:35:33 +0300
Subject: Widget: Fixed arrangement resetting

The expand flag should be reset only in the context of the parent's arrangement/resize direction.
---
 src/ui/mobile.c        | 2 --
 src/ui/sidebarwidget.c | 8 ++++----
 src/ui/widget.c        | 9 ++++++---
 3 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/mobile.c b/src/ui/mobile.c
index f93d4352..ae503f77 100644
--- a/src/ui/mobile.c
+++ b/src/ui/mobile.c
@@ -657,8 +657,6 @@ void finalizeSheet_Mobile(iWidget *sheet) {
         iAssert(sheet->parent);
         arrange_Widget(sheet->parent);
         postCommand_App("widget.overflow"); /* with the correct dimensions */
-        //puts("---- MOBILE LAYOUT ----");
-        //printTree_Widget(sheet);
     }
     else {
         arrange_Widget(sheet);
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 6ae611b9..9f8eac19 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -522,11 +522,11 @@ float width_SidebarWidget(const iSidebarWidget *d) {
 }
 
 static const char *normalModeLabels_[max_SidebarMode] = {
-    book_Icon " ${sidebar.bookmarks}",
-    star_Icon " ${sidebar.feeds}",
-    clock_Icon " ${sidebar.history}",
+    book_Icon   " ${sidebar.bookmarks}",
+    star_Icon   " ${sidebar.feeds}",
+    clock_Icon  " ${sidebar.history}",
     person_Icon " ${sidebar.identities}",
-    page_Icon " ${sidebar.outline}",
+    page_Icon   " ${sidebar.outline}",
 };
 
 static const char *tightModeLabels_[max_SidebarMode] = {
diff --git a/src/ui/widget.c b/src/ui/widget.c
index 23c701e4..475e7c1f 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -725,12 +725,15 @@ static void resetArrangement_Widget_(iWidget *d) {
             if (d->flags & arrangeHorizontal_WidgetFlag) {
                 child->rect.pos.x = 0;
             }
+            if (d->flags & resizeWidthOfChildren_WidgetFlag && child->flags & expand_WidgetFlag) {
+                child->rect.size.x = 0;
+            }
             if (d->flags & arrangeVertical_WidgetFlag) {
                 child->rect.pos.y = 0;
             }
-        }
-        if (child->flags & expand_WidgetFlag) {
-            child->rect = zero_Rect();
+            if (d->flags & resizeHeightOfChildren_WidgetFlag && child->flags & expand_WidgetFlag) {
+                child->rect.size.y = 0;
+            }
         }
     }
 }
-- 
cgit v1.2.3