diff options
author | 2023-01-24 02:14:50 +0100 | |
---|---|---|
committer | 2023-01-24 02:14:50 +0100 | |
commit | 2dea5fe058f825db1a03cfce1fa84efbcb46a906 (patch) | |
tree | 1991b0c69784d37671686776a0296f047ac16731 /native/src/widget | |
parent | eb4fcba05fb54741289a28ec9b921c90c9acc7fd (diff) | |
parent | 01c484245be54c1aeb6605659fb0f222856c28da (diff) | |
download | iced-2dea5fe058f825db1a03cfce1fa84efbcb46a906.tar.gz iced-2dea5fe058f825db1a03cfce1fa84efbcb46a906.tar.bz2 iced-2dea5fe058f825db1a03cfce1fa84efbcb46a906.zip |
Merge pull request #1655 from tarkah/feat/group-overlay
Group Overlay
Diffstat (limited to 'native/src/widget')
-rw-r--r-- | native/src/widget/pane_grid.rs | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/native/src/widget/pane_grid.rs b/native/src/widget/pane_grid.rs index 8dbd1825..eb04c0ba 100644 --- a/native/src/widget/pane_grid.rs +++ b/native/src/widget/pane_grid.rs @@ -35,7 +35,7 @@ pub use iced_style::pane_grid::{Line, StyleSheet}; use crate::event::{self, Event}; use crate::layout; use crate::mouse; -use crate::overlay; +use crate::overlay::{self, Group}; use crate::renderer; use crate::touch; use crate::widget; @@ -450,14 +450,17 @@ where layout: Layout<'_>, renderer: &Renderer, ) -> Option<overlay::Element<'_, Message, Renderer>> { - self.contents + let children = self + .contents .iter_mut() .zip(&mut tree.children) .zip(layout.children()) - .filter_map(|(((_, pane), tree), layout)| { - pane.overlay(tree, layout, renderer) + .filter_map(|(((_, content), state), layout)| { + content.overlay(state, layout, renderer) }) - .next() + .collect::<Vec<_>>(); + + (!children.is_empty()).then(|| Group::with_children(children).overlay()) } } |