diff options
author | 2025-02-21 19:21:10 +0100 | |
---|---|---|
committer | 2025-02-21 19:21:10 +0100 | |
commit | f1ed99cb47997e1d194a41e7cdf2846f8eb5f8fa (patch) | |
tree | b2eeb7537ffd49bfbdd24c1a9580870eca99caa6 /widget/src/pane_grid.rs | |
parent | 81ca3d2a223d62fbb48b93dcea5409f6212605fa (diff) | |
parent | 800a73ddd7d4a2e0b1ed23ec565cbc6325b3b7f0 (diff) | |
download | iced-f1ed99cb47997e1d194a41e7cdf2846f8eb5f8fa.tar.gz iced-f1ed99cb47997e1d194a41e7cdf2846f8eb5f8fa.tar.bz2 iced-f1ed99cb47997e1d194a41e7cdf2846f8eb5f8fa.zip |
Merge pull request #2809 from iced-rs/rust-2024
Update to Rust 2024
Diffstat (limited to 'widget/src/pane_grid.rs')
-rw-r--r-- | widget/src/pane_grid.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/widget/src/pane_grid.rs b/widget/src/pane_grid.rs index 3ae1dfc7..db93c724 100644 --- a/widget/src/pane_grid.rs +++ b/widget/src/pane_grid.rs @@ -463,7 +463,7 @@ where .filter(|(((pane, _), _), _)| { self.internal .maximized() - .map_or(true, |maximized| *pane == maximized) + .is_none_or(|maximized| *pane == maximized) }) .for_each(|(((_, content), state), layout)| { content.operate(state, layout, renderer, operation); @@ -503,7 +503,7 @@ where .filter(|(((pane, _), _), _)| { self.internal .maximized() - .map_or(true, |maximized| *pane == maximized) + .is_none_or(|maximized| *pane == maximized) }) { let is_picked = picked_pane == Some(pane); @@ -688,10 +688,10 @@ where .iter() .zip(&self.contents) .zip(layout.children()) - .filter(|((&pane, _content), _layout)| { + .filter(|((pane, _content), _layout)| { self.internal .maximized() - .map_or(true, |maximized| pane == maximized) + .is_none_or(|maximized| **pane == maximized) }) .find_map(|((_pane, content), layout)| { content.grid_interaction( @@ -738,7 +738,7 @@ where .filter(|(((pane, _), _), _)| { self.internal .maximized() - .map_or(true, |maximized| *pane == maximized) + .is_none_or(|maximized| *pane == maximized) }) .map(|(((_, content), tree), layout)| { content.mouse_interaction( @@ -846,7 +846,7 @@ where .filter(|(((pane, _), _), _)| { self.internal .maximized() - .map_or(true, |maximized| maximized == *pane) + .is_none_or(|maximized| maximized == *pane) }) { match picked_pane { |