Fix the formatting of the last changes

iced-rs · Feb 5, 2024 · 6e41c6f · 6e41c6f
1 parent a392d57
commit 6e41c6f
Show file tree

Hide file tree

Showing 17 changed files with 107 additions and 94 deletions.
diff --git a/src/native/card.rs b/src/native/card.rs
@@ -14,7 +14,7 @@ use iced_widget::{
         renderer, touch,
         widget::{Operation, Tree},
         Alignment, Border, Clipboard, Color, Element, Event, Layout, Length, Padding, Pixels,
-        Point, Rectangle, Shadow, Shell, Size, Vector, Widget
+        Point, Rectangle, Shadow, Shell, Size, Vector, Widget,
     },
     text::LineHeight,
 };
@@ -595,7 +595,9 @@ where
             .zip(layout.children())
             .filter_map(|((child, state), layout)| {
                 layout.children().next().and_then(|child_layout| {
-                    child.as_widget_mut().overlay(state, child_layout, renderer, translation)
+                    child
+                        .as_widget_mut()
+                        .overlay(state, child_layout, renderer, translation)
                 })
             })
             .collect::<Vec<_>>();

diff --git a/src/native/color_picker.rs b/src/native/color_picker.rs
@@ -17,7 +17,7 @@ use iced_widget::{
             self,
             tree::{self, Tag, Tree},
         },
-        Clipboard, Color, Element, Event, Layout, Length, Point, Rectangle, Shell, Vector, Widget
+        Clipboard, Color, Element, Event, Layout, Length, Point, Rectangle, Shell, Vector, Widget,
     },
     renderer::Renderer,
 };
@@ -247,10 +247,12 @@ where
         let picker_state: &mut State = state.state.downcast_mut();
 
         if !self.show_picker {
-            return self
-                .underlay
-                .as_widget_mut()
-                .overlay(&mut state.children[0], layout, renderer, translation);
+            return self.underlay.as_widget_mut().overlay(
+                &mut state.children[0],
+                layout,
+                renderer,
+                translation,
+            );
         }
 
         let bounds = layout.bounds();

diff --git a/src/native/context_menu.rs b/src/native/context_menu.rs
@@ -6,7 +6,7 @@ use iced_widget::core::{
     mouse::{self, Button, Cursor},
     overlay, renderer,
     widget::{tree, Operation, Tree},
-    Clipboard, Element, Event, Layout, Length, Point, Rectangle, Shell, Vector, Widget
+    Clipboard, Element, Event, Layout, Length, Point, Rectangle, Shell, Vector, Widget,
 };
 
 use crate::native::overlay::ContextMenuOverlay;
@@ -223,10 +223,12 @@ where
         let s: &mut State = state.state.downcast_mut();
 
         if !s.show {
-            return self
-                .underlay
-                .as_widget_mut()
-                .overlay(&mut state.children[0], layout, renderer, translation);
+            return self.underlay.as_widget_mut().overlay(
+                &mut state.children[0],
+                layout,
+                renderer,
+                translation,
+            );
         }
 
         let position = s.cursor_position;
@@ -238,8 +240,9 @@ where
                 &mut state.children[1],
                 content,
                 self.style.clone(),
-                s
-            ).overlay(),
+                s,
+            )
+            .overlay(),
         )
     }
 }

diff --git a/src/native/date_picker.rs b/src/native/date_picker.rs
@@ -16,7 +16,7 @@ use iced_widget::{
             self,
             tree::{Tag, Tree},
         },
-        Clipboard, Element, Event, Layout, Length, Point, Rectangle, Shell, Vector, Widget
+        Clipboard, Element, Event, Layout, Length, Point, Rectangle, Shell, Vector, Widget,
     },
     renderer::Renderer,
     text,
@@ -254,10 +254,12 @@ where
         let picker_state: &mut State = state.state.downcast_mut();
 
         if !self.show_picker {
-            return self
-                .underlay
-                .as_widget_mut()
-                .overlay(&mut state.children[0], layout, renderer, translation);
+            return self.underlay.as_widget_mut().overlay(
+                &mut state.children[0],
+                layout,
+                renderer,
+                translation,
+            );
         }
 
         let bounds = layout.bounds();

diff --git a/src/native/floating_element.rs b/src/native/floating_element.rs
@@ -10,7 +10,7 @@ use iced_widget::core::{
     mouse::{self, Cursor},
     overlay, renderer,
     widget::{Operation, Tree},
-    Clipboard, Element, Event, Layout, Length, Rectangle, Shell, Vector, Widget
+    Clipboard, Element, Event, Layout, Length, Rectangle, Shell, Vector, Widget,
 };
 
 pub mod anchor;
@@ -214,25 +214,27 @@ where
         translation: Vector,
     ) -> Option<overlay::Element<'b, Message, Theme, Renderer>> {
         if self.hidden {
-            return self
-                .underlay
-                .as_widget_mut()
-                .overlay(&mut state.children[0], layout, renderer, translation);
+            return self.underlay.as_widget_mut().overlay(
+                &mut state.children[0],
+                layout,
+                renderer,
+                translation,
+            );
         }
 
         if state.children.len() == 2 {
             let bounds = layout.bounds();
 
-            Some(overlay::Element::new(
-                Box::new(FloatingElementOverlay::new(
+            Some(overlay::Element::new(Box::new(
+                FloatingElementOverlay::new(
                     layout.position() + translation,
                     &mut state.children[1],
                     &mut self.element,
                     &self.anchor,
                     &self.offset,
                     bounds,
-                )),
-            ))
+                ),
+            )))
         } else {
             None
         }

diff --git a/src/native/grid/widget.rs b/src/native/grid/widget.rs
@@ -5,7 +5,7 @@ use iced_widget::core::{
     overlay::Group,
     renderer::Style,
     widget::{Operation, Tree},
-    Clipboard, Element, Event, Layout, Length, Rectangle, Shell, Size, Vector, Widget
+    Clipboard, Element, Event, Layout, Length, Rectangle, Shell, Size, Vector, Widget,
 };
 
 use super::{layout::layout, types::Grid};
@@ -166,7 +166,9 @@ where
             .zip(&mut tree.children)
             .zip(layout.children())
             .filter_map(|((child, state), layout)| {
-                child.as_widget_mut().overlay(state, layout, renderer, translation)
+                child
+                    .as_widget_mut()
+                    .overlay(state, layout, renderer, translation)
             })
             .collect::<Vec<_>>();
 

diff --git a/src/native/modal.rs b/src/native/modal.rs
@@ -10,7 +10,7 @@ use iced_widget::core::{
     mouse::{self, Cursor},
     overlay, renderer,
     widget::{Operation, Tree},
-    Clipboard, Element, Event, Layout, Length, Rectangle, Shell, Vector, Widget
+    Clipboard, Element, Event, Layout, Length, Rectangle, Shell, Vector, Widget,
 };
 
 pub use crate::style::modal::StyleSheet;
@@ -237,21 +237,22 @@ where
         if let Some(overlay) = &mut self.overlay {
             overlay.as_widget().diff(&mut state.children[1]);
 
-            Some(overlay::Element::new(
-                Box::new(ModalOverlay::new(
-                    &mut state.children[1],
-                    overlay,
-                    self.backdrop.clone(),
-                    self.esc.clone(),
-                    self.style.clone(),
-                    self.horizontal_alignment,
-                    self.vertical_alignment,
-                )),
-            ))
+            Some(overlay::Element::new(Box::new(ModalOverlay::new(
+                &mut state.children[1],
+                overlay,
+                self.backdrop.clone(),
+                self.esc.clone(),
+                self.style.clone(),
+                self.horizontal_alignment,
+                self.vertical_alignment,
+            ))))
         } else {
-            self.underlay
-                .as_widget_mut()
-                .overlay(&mut state.children[0], layout, renderer, translation)
+            self.underlay.as_widget_mut().overlay(
+                &mut state.children[0],
+                layout,
+                renderer,
+                translation,
+            )
         }
     }
 

diff --git a/src/native/overlay/color_picker.rs b/src/native/overlay/color_picker.rs
@@ -552,11 +552,7 @@ where
     Message: 'static + Clone,
     Theme: 'a + StyleSheet + button::StyleSheet + widget::text::StyleSheet,
 {
-    fn layout(
-        &mut self,
-        renderer: &Renderer,
-        bounds: Size,
-    ) -> Node {
+    fn layout(&mut self, renderer: &Renderer, bounds: Size) -> Node {
         let (max_width, max_height) = if bounds.width > bounds.height {
             (600.0, 300.0)
         } else {

diff --git a/src/native/overlay/context_menu.rs b/src/native/overlay/context_menu.rs
@@ -79,11 +79,7 @@ where
     Renderer: 'a + core::Renderer,
     Theme: StyleSheet,
 {
-    fn layout(
-        &mut self,
-        renderer: &Renderer,
-        bounds: Size,
-    ) -> Node {
+    fn layout(&mut self, renderer: &Renderer, bounds: Size) -> Node {
         let limits = Limits::new(Size::ZERO, bounds);
         let max_size = limits.max();
 

diff --git a/src/native/overlay/date_picker.rs b/src/native/overlay/date_picker.rs
@@ -369,11 +369,7 @@ where
     Theme: 'a + StyleSheet + button::StyleSheet + text::StyleSheet + container::StyleSheet,
 {
     #[allow(clippy::too_many_lines)]
-    fn layout(
-        &mut self,
-        renderer: &Renderer,
-        bounds: Size,
-    ) -> Node {
+    fn layout(&mut self, renderer: &Renderer, bounds: Size) -> Node {
         let limits = Limits::new(Size::ZERO, bounds)
             .shrink(Padding::from(PADDING))
             .width(Length::Fill)

diff --git a/src/native/overlay/floating_element.rs b/src/native/overlay/floating_element.rs
@@ -66,11 +66,7 @@ impl<'a, 'b, Message, Theme, Renderer> core::Overlay<Message, Theme, Renderer>
 where
     Renderer: core::Renderer,
 {
-    fn layout(
-        &mut self,
-        renderer: &Renderer,
-        _bounds: Size,
-    ) -> layout::Node {
+    fn layout(&mut self, renderer: &Renderer, _bounds: Size) -> layout::Node {
         // Constrain overlay to fit inside the underlay's bounds
         let limits = layout::Limits::new(Size::ZERO, self.underlay_bounds.size())
             .width(Length::Fill)
@@ -81,18 +77,25 @@ where
             .layout(self.state, renderer, &limits);
 
         let position = match self.anchor {
-            Anchor::NorthWest => Point::new(self.position.x + self.offset.x, self.position.y + self.offset.y),
+            Anchor::NorthWest => Point::new(
+                self.position.x + self.offset.x,
+                self.position.y + self.offset.y,
+            ),
             Anchor::NorthEast => Point::new(
                 self.position.x + self.underlay_bounds.width - node.bounds().width - self.offset.x,
                 self.position.y + self.offset.y,
             ),
             Anchor::SouthWest => Point::new(
                 self.position.x + self.offset.x,
-                self.position.y + self.underlay_bounds.height - node.bounds().height - self.offset.y,
+                self.position.y + self.underlay_bounds.height
+                    - node.bounds().height
+                    - self.offset.y,
             ),
             Anchor::SouthEast => Point::new(
                 self.position.x + self.underlay_bounds.width - node.bounds().width - self.offset.x,
-                self.position.y + self.underlay_bounds.height - node.bounds().height - self.offset.y,
+                self.position.y + self.underlay_bounds.height
+                    - node.bounds().height
+                    - self.offset.y,
             ),
             Anchor::North => Point::new(
                 self.position.x + self.underlay_bounds.width / 2.0 - node.bounds().width / 2.0
@@ -107,7 +110,9 @@ where
             Anchor::South => Point::new(
                 self.position.x + self.underlay_bounds.width / 2.0 - node.bounds().width / 2.0
                     + self.offset.x,
-                self.position.y + self.underlay_bounds.height - node.bounds().height - self.offset.y,
+                self.position.y + self.underlay_bounds.height
+                    - node.bounds().height
+                    - self.offset.y,
             ),
             Anchor::West => Point::new(
                 self.position.x + self.offset.x,

diff --git a/src/native/overlay/modal.rs b/src/native/overlay/modal.rs
@@ -6,8 +6,8 @@ use iced_widget::core::{
     mouse::{self, Cursor},
     renderer, touch,
     widget::Tree,
-    Alignment, Border, Clipboard, Color, Element, Event, Layout, Overlay, Rectangle, Shadow,
-    Shell, Size,
+    Alignment, Border, Clipboard, Color, Element, Event, Layout, Overlay, Rectangle, Shadow, Shell,
+    Size,
 };
 
 use crate::style::modal::StyleSheet;
@@ -69,11 +69,7 @@ where
     Renderer: core::Renderer,
     Theme: StyleSheet,
 {
-    fn layout(
-        &mut self,
-        renderer: &Renderer,
-        bounds: Size,
-    ) -> layout::Node {
+    fn layout(&mut self, renderer: &Renderer, bounds: Size) -> layout::Node {
         let limits = layout::Limits::new(Size::ZERO, bounds);
         let mut content = self
             .content

diff --git a/src/native/overlay/time_picker.rs b/src/native/overlay/time_picker.rs
@@ -509,11 +509,7 @@ where
     Message: 'static + Clone,
     Theme: 'a + StyleSheet + button::StyleSheet + text::StyleSheet + container::StyleSheet,
 {
-    fn layout(
-        &mut self,
-        renderer: &Renderer,
-        bounds: Size,
-    ) -> Node {
+    fn layout(&mut self, renderer: &Renderer, bounds: Size) -> Node {
         let limits = Limits::new(Size::ZERO, bounds)
             .shrink(Padding::from(PADDING))
             .width(Length::Fill)

diff --git a/src/native/split.rs b/src/native/split.rs
@@ -14,7 +14,7 @@ use iced_widget::{
             Operation, Tree,
         },
         Border, Clipboard, Color, Element, Event, Layout, Length, Padding, Point, Rectangle,
-        Shadow, Shell, Size, Vector, Widget
+        Shadow, Shell, Size, Vector, Widget,
     },
     Container, Row,
 };
@@ -516,9 +516,12 @@ where
             .as_widget_mut()
             .overlay(&mut first_state[0], first_layout, renderer, translation)
             .or_else(|| {
-                second
-                    .as_widget_mut()
-                    .overlay(&mut second_state[0], second_layout, renderer, translation)
+                second.as_widget_mut().overlay(
+                    &mut second_state[0],
+                    second_layout,
+                    renderer,
+                    translation,
+                )
             })
     }
 }

diff --git a/src/native/tabs.rs b/src/native/tabs.rs
@@ -20,7 +20,7 @@ use iced_widget::{
             tree::{State, Tag},
             Operation, Tree,
         },
-        Clipboard, Element, Event, Layout, Length, Point, Rectangle, Shell, Size, Vector, Widget
+        Clipboard, Element, Event, Layout, Length, Point, Rectangle, Shell, Size, Vector, Widget,
     },
     runtime::Font,
     text, Row,
@@ -570,7 +570,14 @@ where
             self.tabs
                 .get_mut(idx)
                 .map(Element::as_widget_mut)
-                .and_then(|w| w.overlay(&mut state.children[1].children[idx], layout, renderer, translation))
+                .and_then(|w| {
+                    w.overlay(
+                        &mut state.children[1].children[idx],
+                        layout,
+                        renderer,
+                        translation,
+                    )
+                })
         })
     }