diff options
Diffstat (limited to 'widget/src/pane_grid')
-rw-r--r-- | widget/src/pane_grid/content.rs | 15 | ||||
-rw-r--r-- | widget/src/pane_grid/title_bar.rs | 6 |
2 files changed, 16 insertions, 5 deletions
diff --git a/widget/src/pane_grid/content.rs b/widget/src/pane_grid/content.rs index 415dcc3e..dfe0fdcf 100644 --- a/widget/src/pane_grid/content.rs +++ b/widget/src/pane_grid/content.rs @@ -5,7 +5,9 @@ use crate::core::mouse; use crate::core::overlay; use crate::core::renderer; use crate::core::widget::{self, Tree}; -use crate::core::{Clipboard, Element, Layout, Point, Rectangle, Shell, Size}; +use crate::core::{ + Clipboard, Element, Layout, Point, Rectangle, Shell, Size, Vector, +}; use crate::pane_grid::{Draggable, TitleBar}; /// The content of a [`Pane`]. @@ -330,6 +332,7 @@ where tree: &'b mut Tree, layout: Layout<'_>, renderer: &Renderer, + translation: Vector, ) -> Option<overlay::Element<'b, Message, Theme, Renderer>> { if let Some(title_bar) = self.title_bar.as_mut() { let mut children = layout.children(); @@ -339,13 +342,18 @@ where let body_state = states.next().unwrap(); let title_bar_state = states.next().unwrap(); - match title_bar.overlay(title_bar_state, title_bar_layout, renderer) - { + match title_bar.overlay( + title_bar_state, + title_bar_layout, + renderer, + translation, + ) { Some(overlay) => Some(overlay), None => self.body.as_widget_mut().overlay( body_state, children.next()?, renderer, + translation, ), } } else { @@ -353,6 +361,7 @@ where &mut tree.children[0], layout, renderer, + translation, ) } } diff --git a/widget/src/pane_grid/title_bar.rs b/widget/src/pane_grid/title_bar.rs index 3cca6b33..5b57509b 100644 --- a/widget/src/pane_grid/title_bar.rs +++ b/widget/src/pane_grid/title_bar.rs @@ -6,7 +6,7 @@ use crate::core::overlay; use crate::core::renderer; use crate::core::widget::{self, Tree}; use crate::core::{ - Clipboard, Element, Layout, Padding, Point, Rectangle, Shell, Size, + Clipboard, Element, Layout, Padding, Point, Rectangle, Shell, Size, Vector, }; /// The title bar of a [`Pane`]. @@ -405,6 +405,7 @@ where tree: &'b mut Tree, layout: Layout<'_>, renderer: &Renderer, + translation: Vector, ) -> Option<overlay::Element<'b, Message, Theme, Renderer>> { let mut children = layout.children(); let padded = children.next()?; @@ -422,7 +423,7 @@ where content .as_widget_mut() - .overlay(title_state, title_layout, renderer) + .overlay(title_state, title_layout, renderer, translation) .or_else(move || { controls.as_mut().and_then(|controls| { let controls_layout = children.next()?; @@ -431,6 +432,7 @@ where controls_state, controls_layout, renderer, + translation, ) }) }) |