Skip to content

Commit 557a7cc

Browse files
Dluraknik-rev
authored andcommitted
fix linting problems
1 parent 3b6d6d8 commit 557a7cc

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

src/app.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ impl Default for App {
105105
selection: None,
106106
selections_created: 0,
107107
errors: vec![],
108-
config: Config::parse()
108+
config: Config::parse(),
109109
}
110110
}
111111
}

src/canvas.rs

+9-10
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
//! The canvas handles drawing the selection frame
2-
use iced::advanced::debug::core::SmolStr;
3-
use iced::keyboard::key::Named::F11;
4-
use iced::keyboard::key::Named::{Enter, Escape, Shift};
2+
use iced::Event::{Keyboard, Mouse};
53
use iced::keyboard::Event::KeyPressed;
64
use iced::keyboard::Event::KeyReleased;
75
use iced::keyboard::Key::{Character, Named};
86
use iced::keyboard::Modifiers as Mods;
7+
use iced::keyboard::key::Named::F11;
8+
use iced::keyboard::key::Named::{Enter, Escape, Shift};
99
use iced::mouse::Button::{Left, Middle, Right};
1010
use iced::mouse::Event::ButtonPressed;
1111
use iced::mouse::Event::ButtonReleased;
1212
use iced::mouse::Event::CursorMoved;
13-
use iced::Event::{Keyboard, Mouse};
1413
use iced::{
15-
mouse::{self, Interaction},
16-
widget::{self, canvas, Action},
1714
Rectangle, Renderer, Theme,
15+
mouse::{self, Interaction},
16+
widget::{self, Action, canvas},
1817
};
1918

2019
/// Holds information about the mouse
@@ -30,11 +29,11 @@ pub struct MouseState {
3029

3130
use crate::selection::Speed;
3231
use crate::{
32+
App,
3333
corners::SideOrCorner,
3434
message::Message,
35-
selection::{selection_lock::OptionalSelectionExt as _, Selection, SelectionStatus},
35+
selection::{Selection, SelectionStatus, selection_lock::OptionalSelectionExt as _},
3636
theme::THEME,
37-
App,
3837
};
3938

4039
impl canvas::Program<Message> for App {
@@ -167,7 +166,8 @@ impl canvas::Program<Message> for App {
167166
}) if *c == "s" => Message::SaveScreenshot,
168167
Keyboard(KeyPressed {
169168
key: Named(F11), ..
170-
}) => Message::SelectFullScreen,
169+
})
170+
| Mouse(ButtonPressed(Middle)) => Message::SelectFullScreen,
171171
Keyboard(KeyPressed {
172172
key: Named(Shift), ..
173173
}) => {
@@ -269,7 +269,6 @@ impl canvas::Program<Message> for App {
269269
Mouse(CursorMoved { position }) if self.selection.is_some_and(Selection::is_create) => {
270270
Message::ExtendNewSelection(*position)
271271
}
272-
Mouse(ButtonPressed(Middle)) => Message::SelectFullScreen,
273272
_ => return None,
274273
};
275274

0 commit comments

Comments
 (0)