Fixed Formatting and Clippy issues

genusistimelord · genusistimelord · commit 9e7ec3a45f0e · 2026-03-19T09:01:34.000-04:00
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -128,6 +128,25 @@
       "args": [],
       "cwd": "${workspaceFolder}"
     },
+    {
+      "type": "lldb",
+      "request": "launch",
+      "name": "Debug example 'menu_test'",
+      "cargo": {
+        "args": [
+          "build",
+          "--example=menu_test",
+          "--features=menu",
+          "--features=quad"
+        ],
+        "filter": {
+          "name": "menu_test",
+          "kind": "example"
+        }
+      },
+      "args": [],
+      "cwd": "${workspaceFolder}"
+    },
     {
       "type": "lldb",
       "request": "launch",
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -64,7 +64,7 @@ full = [
 
 [dev-dependencies]
 iced_aw = { path = "./" }
-getrandom = { version = "0.4.1", features = ["wasm_js"] }
+getrandom = { version = "0.4.2", features = ["wasm_js"] }
 rand = "0.10.0"
 env_logger = "0.11.9"                                        # For wrap example
 iced_test = "0.14" # for UI testing
@@ -119,6 +119,10 @@ required-features = ["date_picker"]
 name = "menu"
 required-features = ["menu"]
 
+[[example]]
+name = "menu_test"
+required-features = ["menu"]
+
 [[example]]
 name = "number_input"
 required-features = ["number_input"]
diff --git a/examples/context_menu.rs b/examples/context_menu.rs
@@ -74,9 +74,12 @@ impl ContextMenuExample {
                     .into(),
             ])
             .into()
-        }).style(|t: &Theme, _: iced_aw::style::Status| iced_aw::context_menu::Style {
-            background: iced::Background::Color(t.palette().primary)
         })
+        .style(
+            |t: &Theme, _: iced_aw::style::Status| iced_aw::context_menu::Style {
+                background: iced::Background::Color(t.palette().primary),
+            },
+        )
         .into()
     }
 }
diff --git a/examples/dropdown_pos.rs b/examples/dropdown_pos.rs
@@ -4,7 +4,6 @@ use iced::{
     widget::{button, column, container, row, scrollable, text},
 };
 use iced_aw::{DropDown, drop_down};
-use std::str::FromStr;
 
 fn main() -> iced::Result {
     iced::application(App::default, App::update, App::view).run()
@@ -18,12 +17,12 @@ enum DropDownItem {
     C,
 }
 
-impl ToString for DropDownItem {
-    fn to_string(&self) -> String {
+impl std::fmt::Display for DropDownItem {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            DropDownItem::A => String::from_str("A").unwrap(),
-            DropDownItem::B => String::from_str("B").unwrap(),
-            DropDownItem::C => String::from_str("C").unwrap(),
+            DropDownItem::A => write!(f, "A"),
+            DropDownItem::B => write!(f, "B"),
+            DropDownItem::C => write!(f, "C"),
         }
     }
 }
diff --git a/examples/menu_test.rs b/examples/menu_test.rs
@@ -0,0 +1,54 @@
+use iced::Length;
+use iced_aw::{Menu, MenuBar, menu, menu_items};
+use iced_widget::{button, container, text};
+
+#[derive(Default)]
+pub struct App;
+
+#[derive(Clone, Copy)]
+pub enum Message {
+    NoOp,
+}
+
+pub fn main() -> iced::Result {
+    iced::application(App::default, App::update, App::view).run()
+}
+
+impl App {
+    pub fn update(&mut self, msg: Message) {
+        match msg {
+            Message::NoOp => println!("Hello"),
+        }
+    }
+
+    pub fn title(&self) -> String {
+        "hello".into()
+    }
+
+    pub fn view(&self) -> iced::Element<'_, Message> {
+        let file_menu = Menu::new(menu_items!(
+            (button("New").on_press(Message::NoOp)),
+            (button("Open").on_press(Message::NoOp)),
+            (button("Exit").on_press(Message::NoOp)),
+        ))
+        .width(Length::Fill);
+
+        let edit_menu = Menu::new(menu_items!(
+            (button("Copy").on_press(Message::NoOp)),
+            (button("Paste").on_press(Message::NoOp)),
+        ))
+        .width(Length::Shrink);
+
+        let about_menu =
+            Menu::new(menu_items!((button("About").on_press(Message::NoOp)))).width(Length::Shrink);
+
+        let menu_bar = MenuBar::new(menu_items!(
+            (container(text("File")), file_menu),
+            (container(text("Edit")), edit_menu),
+            (container(text("Help")), about_menu),
+        ))
+        .draw_path(menu::DrawPath::Backdrop);
+
+        menu_bar.into()
+    }
+}
diff --git a/src/widget/context_menu.rs b/src/widget/context_menu.rs
@@ -159,7 +159,10 @@ where
     }
 
     fn children(&self) -> Vec<Tree> {
-        let overlay_tree = self.overlay_instance.as_ref().map(Tree::new).unwrap_or_else(Tree::empty);
+        let overlay_tree = self
+            .overlay_instance
+            .as_ref()
+            .map_or_else(Tree::empty, Tree::new);
         vec![Tree::new(&self.underlay), overlay_tree]
     }
 
diff --git a/src/widget/drop_down.rs b/src/widget/drop_down.rs
@@ -415,19 +415,20 @@ where
 
         if let Some(on_dismiss) = self.on_dismiss {
             match &event {
-                Event::Keyboard(keyboard::Event::KeyPressed { key, .. }) => {
-                    if key == &keyboard::Key::Named(Named::Escape) {
-                        shell.publish(on_dismiss.clone());
-                    }
+                Event::Keyboard(keyboard::Event::KeyPressed { key, .. })
+                    if key == &keyboard::Key::Named(Named::Escape) =>
+                {
+                    shell.publish(on_dismiss.clone());
                 }
 
                 Event::Mouse(mouse::Event::ButtonPressed(
                     mouse::Button::Left | mouse::Button::Right,
                 ))
-                | Event::Touch(touch::Event::FingerPressed { .. }) => {
-                    if !cursor.is_over(layout.bounds()) && !cursor.is_over(self.underlay_bounds) {
-                        shell.publish(on_dismiss.clone());
-                    }
+                | Event::Touch(touch::Event::FingerPressed { .. })
+                    if !cursor.is_over(layout.bounds())
+                        && !cursor.is_over(self.underlay_bounds) =>
+                {
+                    shell.publish(on_dismiss.clone());
                 }
 
                 _ => {}
diff --git a/src/widget/menu/menu_bar.rs b/src/widget/menu/menu_bar.rs
@@ -429,25 +429,25 @@ where
         // println!("cursor in bar_bounds: {:?}", cursor.is_over(bar_bounds));
 
         match event {
-            Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left)) => {
-                if cursor.is_over(bar_bounds) {
-                    global_state.pressed = true;
-                    if global_state.open {
-                        schedule_close_on_click(
-                            global_state,
-                            &self.global_parameters,
-                            slice,
-                            &mut self.roots,
-                            slice_layout.children(),
-                            cursor,
-                            self.close_on_item_click,
-                            self.close_on_background_click,
-                        );
-                    } else {
-                        global_state.schedule(MenuBarTask::OpenOnClick);
-                    }
-                    shell.capture_event();
+            Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left))
+                if cursor.is_over(bar_bounds) =>
+            {
+                global_state.pressed = true;
+                if global_state.open {
+                    schedule_close_on_click(
+                        global_state,
+                        &self.global_parameters,
+                        slice,
+                        &mut self.roots,
+                        slice_layout.children(),
+                        cursor,
+                        self.close_on_item_click,
+                        self.close_on_background_click,
+                    );
+                } else {
+                    global_state.schedule(MenuBarTask::OpenOnClick);
                 }
+                shell.capture_event();
             }
             Event::Mouse(mouse::Event::ButtonReleased(mouse::Button::Left)) => {
                 global_state.pressed = false;
@@ -469,42 +469,39 @@ where
                     }
                 }
             }
-            Event::Mouse(mouse::Event::CursorMoved { .. }) => {
-                if global_state.open {
-                    if cursor.is_over(bar_bounds) {
-                        try_open_menu(
-                            &mut self.roots,
-                            bar_menu_state,
-                            item_trees,
-                            slice_layout.children(),
-                            cursor,
-                            shell,
-                        );
-                        shell.capture_event();
-                    } else {
-                        bar.close(item_trees, shell);
-                    }
-                }
-            }
-            Event::Mouse(mouse::Event::WheelScrolled { delta }) => {
-                if cursor.is_over(bar_bounds) && slice_layout.bounds().width > layout.bounds().width
-                // check if scrolling is on
-                {
-                    let scroll_speed = self.global_parameters.scroll_speed;
-                    let delta_x = match delta {
-                        mouse::ScrollDelta::Lines { x, .. } => x * scroll_speed.line,
-                        mouse::ScrollDelta::Pixels { x, .. } => x * scroll_speed.pixel,
-                    };
-
-                    let min_offset = -(slice_layout.bounds().width - layout.bounds().width);
-
-                    bar_menu_state.scroll_offset =
-                        (bar_menu_state.scroll_offset + delta_x).clamp(min_offset, 0.0);
-                    shell.invalidate_layout();
-                    shell.request_redraw();
+            Event::Mouse(mouse::Event::CursorMoved { .. }) if global_state.open => {
+                if cursor.is_over(bar_bounds) {
+                    try_open_menu(
+                        &mut self.roots,
+                        bar_menu_state,
+                        item_trees,
+                        slice_layout.children(),
+                        cursor,
+                        shell,
+                    );
                     shell.capture_event();
+                } else {
+                    bar.close(item_trees, shell);
                 }
             }
+            Event::Mouse(mouse::Event::WheelScrolled { delta })
+                if cursor.is_over(bar_bounds)
+                    && slice_layout.bounds().width > layout.bounds().width =>
+            {
+                let scroll_speed = self.global_parameters.scroll_speed;
+                let delta_x = match delta {
+                    mouse::ScrollDelta::Lines { x, .. } => x * scroll_speed.line,
+                    mouse::ScrollDelta::Pixels { x, .. } => x * scroll_speed.pixel,
+                };
+
+                let min_offset = -(slice_layout.bounds().width - layout.bounds().width);
+
+                bar_menu_state.scroll_offset =
+                    (bar_menu_state.scroll_offset + delta_x).clamp(min_offset, 0.0);
+                shell.invalidate_layout();
+                shell.request_redraw();
+                shell.capture_event();
+            }
             Event::Window(window::Event::Resized { .. }) => {
                 if slice_layout.bounds().width > layout.bounds().width {
                     let min_offset = -(slice_layout.bounds().width - layout.bounds().width);
diff --git a/src/widget/overlay/context_menu.rs b/src/widget/overlay/context_menu.rs
@@ -166,15 +166,14 @@ where
         let mut capture_event = false;
 
         match &event {
-            Event::Keyboard(keyboard::Event::KeyPressed { key, .. }) => {
-                if *key == keyboard::Key::Named(keyboard::key::Named::Escape) {
-                    self.state.show = false;
-                    forward_event_to_children = false;
-                    shell.capture_event();
-                    shell.request_redraw();
-                }
+            Event::Keyboard(keyboard::Event::KeyPressed { key, .. })
+                if *key == keyboard::Key::Named(keyboard::key::Named::Escape) =>
+            {
+                self.state.show = false;
+                forward_event_to_children = false;
+                shell.capture_event();
+                shell.request_redraw();
             }
-
             Event::Mouse(mouse::Event::ButtonPressed(
                 mouse::Button::Left | mouse::Button::Right,
             ))
diff --git a/src/widget/overlay/date_picker.rs b/src/widget/overlay/date_picker.rs
diff --git a/src/widget/slide_bar.rs b/src/widget/slide_bar.rs
diff --git a/src/widget/tab_bar.rs b/src/widget/tab_bar.rs

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@ use iced::{`
`4`	`4`	`widget::{button, column, container, row, scrollable, text},`
`5`	`5`	`};`
`6`	`6`	`use iced_aw::{DropDown, drop_down};`
`7`		`-use std::str::FromStr;`
`8`	`7`
`9`	`8`	`fn main() -> iced::Result {`
`10`	`9`	`iced::application(App::default, App::update, App::view).run()`
`@@ -18,12 +17,12 @@ enum DropDownItem {`
`18`	`17`	`C,`
`19`	`18`	`}`
`20`	`19`
`21`		`-impl ToString for DropDownItem {`
`22`		`- fn to_string(&self) -> String {`
	`20`	`+impl std::fmt::Display for DropDownItem {`
	`21`	`+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {`
`23`	`22`	`match self {`
`24`		`- DropDownItem::A => String::from_str("A").unwrap(),`
`25`		`- DropDownItem::B => String::from_str("B").unwrap(),`
`26`		`- DropDownItem::C => String::from_str("C").unwrap(),`
	`23`	`+ DropDownItem::A => write!(f, "A"),`
	`24`	`+ DropDownItem::B => write!(f, "B"),`
	`25`	`+ DropDownItem::C => write!(f, "C"),`
`27`	`26`	`}`
`28`	`27`	`}`
`29`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,10 @@ where`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`fn children(&self) -> Vec<Tree> {`
`162`		`- let overlay_tree = self.overlay_instance.as_ref().map(Tree::new).unwrap_or_else(Tree::empty);`
	`162`	`+ let overlay_tree = self`
	`163`	`+ .overlay_instance`
	`164`	`+ .as_ref()`
	`165`	`+ .map_or_else(Tree::empty, Tree::new);`
`163`	`166`	`vec![Tree::new(&self.underlay), overlay_tree]`
`164`	`167`	`}`
`165`	`168`