From e7787823282f7788192a94ad5d1ba43d0bfee8c8 Mon Sep 17 00:00:00 2001
From: Ashley Wulber <ashley@system76.com>
Date: Thu, 1 Feb 2024 17:29:33 -0500
Subject: [PATCH] fix: layout fixes for nav bar

---
 iced                                    |  2 +-
 src/app/mod.rs                          |  5 ++++-
 src/widget/nav_bar.rs                   |  1 +
 src/widget/segmented_button/vertical.rs | 10 +++++-----
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/iced b/iced
index 32a0efcd..73e887bc 160000
--- a/iced
+++ b/iced
@@ -1 +1 @@
-Subproject commit 32a0efcd05e827ba3ad9913e50dd103510e8bca7
+Subproject commit 73e887bcfb946ec72d21787579721986f99feb8e
diff --git a/src/app/mod.rs b/src/app/mod.rs
index e2c5bb8e..baffac84 100644
--- a/src/app/mod.rs
+++ b/src/app/mod.rs
@@ -449,7 +449,10 @@ where
             nav = nav.max_width(300);
         }
 
-        Some(Element::from(nav))
+        Some(Element::from(
+            // XXX both must be shrink to avoid flex layout from ignoring it
+            nav.width(iced::Length::Shrink).height(iced::Length::Shrink),
+        ))
     }
 
     /// Allows COSMIC to integrate with your application's [`nav_bar::Model`].
diff --git a/src/widget/nav_bar.rs b/src/widget/nav_bar.rs
index 27729794..543d453a 100644
--- a/src/widget/nav_bar.rs
+++ b/src/widget/nav_bar.rs
@@ -35,6 +35,7 @@ where
         .spacing(8)
         .style(crate::theme::SegmentedButton::ViewSwitcher)
         .apply(scrollable)
+        .height(Length::Fill)
         .apply(container)
         .height(Length::Fill)
         .padding(11)
diff --git a/src/widget/segmented_button/vertical.rs b/src/widget/segmented_button/vertical.rs
index 87e965e6..9fac6aa4 100644
--- a/src/widget/segmented_button/vertical.rs
+++ b/src/widget/segmented_button/vertical.rs
@@ -87,11 +87,11 @@ where
         if num != 0 {
             height = (num as f32 * height) + (num as f32 * spacing) - spacing;
         }
-
-        let size =
-            limits
-                .height(Length::Fixed(height))
-                .resolve(width, height, Size::new(width, height));
+        let size = limits.height(Length::Fixed(height)).resolve(
+            self.width,
+            self.height,
+            Size::new(width, height),
+        );
 
         layout::Node::new(size)
     }