chore: add rustfmt config
This commit is contained in:
parent
9abc4d483b
commit
9c2a86a8f4
98 changed files with 419 additions and 540 deletions
|
|
@ -1,11 +1,9 @@
|
|||
// From iced_aw, license MIT
|
||||
|
||||
use iced_core::{Widget, widget::Tree};
|
||||
use iced_widget::core::{
|
||||
Alignment, Element, Padding, Point, Size,
|
||||
layout::{Limits, Node},
|
||||
renderer,
|
||||
};
|
||||
use iced_core::Widget;
|
||||
use iced_core::widget::Tree;
|
||||
use iced_widget::core::layout::{Limits, Node};
|
||||
use iced_widget::core::{Alignment, Element, Padding, Point, Size, renderer};
|
||||
|
||||
use crate::widget::RcElementWrapper;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
// From iced_aw, license MIT
|
||||
|
||||
//! A widget that handles menu trees
|
||||
use std::{collections::HashMap, sync::Arc};
|
||||
use std::collections::HashMap;
|
||||
use std::sync::Arc;
|
||||
|
||||
use super::{
|
||||
menu_inner::{
|
||||
CloseCondition, Direction, ItemHeight, ItemWidth, Menu, MenuState, PathHighlight,
|
||||
},
|
||||
menu_tree::MenuTree,
|
||||
use super::menu_inner::{
|
||||
CloseCondition, Direction, ItemHeight, ItemWidth, Menu, MenuState, PathHighlight,
|
||||
};
|
||||
use super::menu_tree::MenuTree;
|
||||
use crate::Renderer;
|
||||
#[cfg(all(
|
||||
feature = "multi-window",
|
||||
feature = "wayland",
|
||||
|
|
@ -17,26 +17,21 @@ use super::{
|
|||
feature = "surface-message"
|
||||
))]
|
||||
use crate::app::cosmic::{WINDOWING_SYSTEM, WindowingSystem};
|
||||
use crate::{
|
||||
Renderer,
|
||||
style::menu_bar::StyleSheet,
|
||||
widget::{
|
||||
RcWrapper,
|
||||
dropdown::menu::{self, State},
|
||||
menu::menu_inner::init_root_menu,
|
||||
},
|
||||
};
|
||||
use crate::style::menu_bar::StyleSheet;
|
||||
use crate::widget::RcWrapper;
|
||||
use crate::widget::dropdown::menu::{self, State};
|
||||
use crate::widget::menu::menu_inner::init_root_menu;
|
||||
|
||||
use iced::{Point, Shadow, Vector, event::Status, window};
|
||||
use iced::event::Status;
|
||||
use iced::{Point, Shadow, Vector, window};
|
||||
use iced_core::Border;
|
||||
use iced_widget::core::layout::{Limits, Node};
|
||||
use iced_widget::core::mouse::{self, Cursor};
|
||||
use iced_widget::core::renderer::{self, Renderer as IcedRenderer};
|
||||
use iced_widget::core::widget::{Tree, tree};
|
||||
use iced_widget::core::{
|
||||
Alignment, Clipboard, Element, Layout, Length, Padding, Rectangle, Shell, Widget, event,
|
||||
layout::{Limits, Node},
|
||||
mouse::{self, Cursor},
|
||||
overlay,
|
||||
renderer::{self, Renderer as IcedRenderer},
|
||||
touch,
|
||||
widget::{Tree, tree},
|
||||
overlay, touch,
|
||||
};
|
||||
|
||||
/// A `MenuBar` collects `MenuTree`s and handles all the layout, event processing, and drawing.
|
||||
|
|
@ -590,7 +585,8 @@ where
|
|||
viewport: &Rectangle,
|
||||
) {
|
||||
use event::Event::{Mouse, Touch};
|
||||
use mouse::{Button::Left, Event::ButtonReleased};
|
||||
use mouse::Button::Left;
|
||||
use mouse::Event::ButtonReleased;
|
||||
use touch::Event::{FingerLifted, FingerLost};
|
||||
|
||||
process_root_events(
|
||||
|
|
|
|||
|
|
@ -1,9 +1,11 @@
|
|||
// From iced_aw, license MIT
|
||||
|
||||
//! Menu tree overlay
|
||||
use std::{borrow::Cow, sync::Arc};
|
||||
use std::borrow::Cow;
|
||||
use std::sync::Arc;
|
||||
|
||||
use super::{menu_bar::MenuBarState, menu_tree::MenuTree};
|
||||
use super::menu_bar::MenuBarState;
|
||||
use super::menu_tree::MenuTree;
|
||||
#[cfg(all(
|
||||
feature = "multi-window",
|
||||
feature = "wayland",
|
||||
|
|
@ -16,12 +18,12 @@ use crate::style::menu_bar::StyleSheet;
|
|||
|
||||
use iced::window;
|
||||
use iced_core::{Border, Renderer as IcedRenderer, Shadow, Widget};
|
||||
use iced_widget::core::layout::{Limits, Node};
|
||||
use iced_widget::core::mouse::{self, Cursor};
|
||||
use iced_widget::core::widget::Tree;
|
||||
use iced_widget::core::{
|
||||
Clipboard, Layout, Length, Padding, Point, Rectangle, Shell, Size, Vector, event,
|
||||
layout::{Limits, Node},
|
||||
mouse::{self, Cursor},
|
||||
overlay, renderer, touch,
|
||||
widget::Tree,
|
||||
Clipboard, Layout, Length, Padding, Point, Rectangle, Shell, Size, Vector, event, overlay,
|
||||
renderer, touch,
|
||||
};
|
||||
|
||||
/// The condition of when to close a menu
|
||||
|
|
@ -559,14 +561,10 @@ impl<'b, Message: Clone + 'static> Menu<'b, Message> {
|
|||
clipboard: &mut dyn Clipboard,
|
||||
shell: &mut Shell<'_, Message>,
|
||||
) -> Option<(usize, MenuState)> {
|
||||
use event::{
|
||||
Event::{Mouse, Touch},
|
||||
Status::{Captured, Ignored},
|
||||
};
|
||||
use mouse::{
|
||||
Button::Left,
|
||||
Event::{ButtonPressed, ButtonReleased, CursorMoved, WheelScrolled},
|
||||
};
|
||||
use event::Event::{Mouse, Touch};
|
||||
use event::Status::{Captured, Ignored};
|
||||
use mouse::Button::Left;
|
||||
use mouse::Event::{ButtonPressed, ButtonReleased, CursorMoved, WheelScrolled};
|
||||
use touch::Event::{FingerLifted, FingerMoved, FingerPressed};
|
||||
|
||||
if !self
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue