Lay out title text dynamically in `TitleBar`

2 files changed, 65 insertions, 31 deletions

diff --git a/native/src/widget/pane_grid/content.rs b/native/src/widget/pane_grid/content.rs
index 843dcec4..55fa4c60 100644
--- a/native/src/widget/pane_grid/content.rs
+++ b/native/src/widget/pane_grid/content.rs
@@ -6,7 +6,7 @@ use crate::{Clipboard, Element, Event, Hasher, Layout, Point, Size, Vector};
 /// The content of a [`Pane`].
 ///
 /// [`Pane`]: struct.Pane.html
-pub struct Content<'a, Message, Renderer: container::Renderer> {
+pub struct Content<'a, Message, Renderer: pane_grid::Renderer> {
     title_bar: Option<TitleBar<'a, Message, Renderer>>,
     body: Element<'a, Message, Renderer>,
     style: Renderer::Style,
@@ -14,7 +14,7 @@ pub struct Content<'a, Message, Renderer: container::Renderer> {
 
 impl<'a, Message, Renderer> Content<'a, Message, Renderer>
 where
-    Renderer: container::Renderer,
+    Renderer: pane_grid::Renderer,
 {
     pub fn new(body: impl Into<Element<'a, Message, Renderer>>) -> Self {
         Self {
@@ -43,7 +43,7 @@ where
 
 impl<'a, Message, Renderer> Content<'a, Message, Renderer>
 where
-    Renderer: pane_grid::Renderer + container::Renderer,
+    Renderer: pane_grid::Renderer,
 {
     pub fn draw(
         &self,
diff --git a/native/src/widget/pane_grid/title_bar.rs b/native/src/widget/pane_grid/title_bar.rs
index dc96dcbf..bdf87c17 100644
--- a/native/src/widget/pane_grid/title_bar.rs
+++ b/native/src/widget/pane_grid/title_bar.rs
@@ -1,10 +1,10 @@
-use crate::container;
 use crate::layout;
 use crate::pane_grid;
-use crate::{Clipboard, Element, Event, Layout, Point, Size};
+use crate::{Clipboard, Element, Event, Layout, Point, Rectangle, Size};
 
-pub struct TitleBar<'a, Message, Renderer: container::Renderer> {
-    title: Element<'a, Message, Renderer>,
+pub struct TitleBar<'a, Message, Renderer: pane_grid::Renderer> {
+    title: String,
+    title_size: Option<u16>,
     controls: Option<Element<'a, Message, Renderer>>,
     padding: u16,
     style: Renderer::Style,
@@ -12,17 +12,29 @@ pub struct TitleBar<'a, Message, Renderer: container::Renderer> {
 
 impl<'a, Message, Renderer> TitleBar<'a, Message, Renderer>
 where
-    Renderer: container::Renderer,
+    Renderer: pane_grid::Renderer,
 {
-    pub fn new(title: impl Into<Element<'a, Message, Renderer>>) -> Self {
+    pub fn new(title: impl Into<String>) -> Self {
         Self {
             title: title.into(),
+            title_size: None,
             controls: None,
             padding: 0,
             style: Renderer::Style::default(),
         }
     }
 
+    /// Sets the size of the title of the [`TitleBar`].
+    ///
+    /// [`TitleBar`]: struct.Text.html
+    pub fn title_size(mut self, size: u16) -> Self {
+        self.title_size = Some(size);
+        self
+    }
+
+    /// Sets the controls of the [`TitleBar`].
+    ///
+    /// [`TitleBar`]: struct.TitleBar.html
     pub fn controls(
         mut self,
         controls: impl Into<Element<'a, Message, Renderer>>,
@@ -68,24 +80,38 @@ where
             let title_layout = children.next().unwrap();
             let controls_layout = children.next().unwrap();
 
+            let (title_bounds, controls) = if show_controls {
+                (title_layout.bounds(), Some((controls, controls_layout)))
+            } else {
+                (
+                    Rectangle {
+                        width: padded.bounds().width,
+                        ..title_layout.bounds()
+                    },
+                    None,
+                )
+            };
+
             renderer.draw_title_bar(
                 defaults,
                 layout.bounds(),
                 &self.style,
-                (&self.title, title_layout),
-                if show_controls {
-                    Some((controls, controls_layout))
-                } else {
-                    None
-                },
+                &self.title,
+                self.title_size.unwrap_or(Renderer::DEFAULT_SIZE),
+                Renderer::Font::default(),
+                title_bounds,
+                controls,
                 cursor_position,
             )
         } else {
-            renderer.draw_title_bar(
+            renderer.draw_title_bar::<()>(
                 defaults,
                 layout.bounds(),
                 &self.style,
-                (&self.title, padded),
+                &self.title,
+                self.title_size.unwrap_or(Renderer::DEFAULT_SIZE),
+                Renderer::Font::default(),
+                padded.bounds(),
                 None,
                 cursor_position,
             )
@@ -122,39 +148,47 @@ where
     ) -> layout::Node {
         let padding = f32::from(self.padding);
         let limits = limits.pad(padding);
+        let max_size = limits.max();
 
-        let node = if let Some(controls) = &self.controls {
-            let max_size = limits.max();
+        let title_size = self.title_size.unwrap_or(Renderer::DEFAULT_SIZE);
+        let title_font = Renderer::Font::default();
 
+        let (title_width, title_height) = renderer.measure(
+            &self.title,
+            title_size,
+            title_font,
+            Size::new(f32::INFINITY, max_size.height),
+        );
+
+        let mut node = if let Some(controls) = &self.controls {
             let mut controls_layout = controls
                 .layout(renderer, &layout::Limits::new(Size::ZERO, max_size));
 
             let controls_size = controls_layout.size();
             let space_before_controls = max_size.width - controls_size.width;
 
-            let mut title_layout = self.title.layout(
-                renderer,
-                &layout::Limits::new(
-                    Size::ZERO,
-                    Size::new(space_before_controls, max_size.height),
-                ),
-            );
-
-            title_layout.move_to(Point::new(padding, padding));
-            controls_layout
-                .move_to(Point::new(space_before_controls + padding, padding));
+            let mut title_layout = layout::Node::new(Size::new(
+                title_width.min(space_before_controls),
+                title_height,
+            ));
 
             let title_size = title_layout.size();
             let height = title_size.height.max(controls_size.height);
 
+            title_layout
+                .move_to(Point::new(0.0, (height - title_size.height) / 2.0));
+            controls_layout.move_to(Point::new(space_before_controls, 0.0));
+
             layout::Node::with_children(
                 Size::new(max_size.width, height),
                 vec![title_layout, controls_layout],
             )
         } else {
-            self.title.layout(renderer, &limits)
+            layout::Node::new(Size::new(title_width, title_height))
         };
 
+        node.move_to(Point::new(padding, padding));
+
         layout::Node::with_children(node.size().pad(padding), vec![node])
     }