1
1
//! 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 } ;
5
3
use iced:: keyboard:: Event :: KeyPressed ;
6
4
use iced:: keyboard:: Event :: KeyReleased ;
7
5
use iced:: keyboard:: Key :: { Character , Named } ;
8
6
use iced:: keyboard:: Modifiers as Mods ;
7
+ use iced:: keyboard:: key:: Named :: F11 ;
8
+ use iced:: keyboard:: key:: Named :: { Enter , Escape , Shift } ;
9
9
use iced:: mouse:: Button :: { Left , Middle , Right } ;
10
10
use iced:: mouse:: Event :: ButtonPressed ;
11
11
use iced:: mouse:: Event :: ButtonReleased ;
12
12
use iced:: mouse:: Event :: CursorMoved ;
13
- use iced:: Event :: { Keyboard , Mouse } ;
14
13
use iced:: {
15
- mouse:: { self , Interaction } ,
16
- widget:: { self , canvas, Action } ,
17
14
Rectangle , Renderer , Theme ,
15
+ mouse:: { self , Interaction } ,
16
+ widget:: { self , Action , canvas} ,
18
17
} ;
19
18
20
19
/// Holds information about the mouse
@@ -30,11 +29,11 @@ pub struct MouseState {
30
29
31
30
use crate :: selection:: Speed ;
32
31
use crate :: {
32
+ App ,
33
33
corners:: SideOrCorner ,
34
34
message:: Message ,
35
- selection:: { selection_lock:: OptionalSelectionExt as _, Selection , SelectionStatus } ,
35
+ selection:: { Selection , SelectionStatus , selection_lock:: OptionalSelectionExt as _} ,
36
36
theme:: THEME ,
37
- App ,
38
37
} ;
39
38
40
39
impl canvas:: Program < Message > for App {
@@ -167,7 +166,8 @@ impl canvas::Program<Message> for App {
167
166
} ) if * c == "s" => Message :: SaveScreenshot ,
168
167
Keyboard ( KeyPressed {
169
168
key : Named ( F11 ) , ..
170
- } ) => Message :: SelectFullScreen ,
169
+ } )
170
+ | Mouse ( ButtonPressed ( Middle ) ) => Message :: SelectFullScreen ,
171
171
Keyboard ( KeyPressed {
172
172
key : Named ( Shift ) , ..
173
173
} ) => {
@@ -269,7 +269,6 @@ impl canvas::Program<Message> for App {
269
269
Mouse ( CursorMoved { position } ) if self . selection . is_some_and ( Selection :: is_create) => {
270
270
Message :: ExtendNewSelection ( * position)
271
271
}
272
- Mouse ( ButtonPressed ( Middle ) ) => Message :: SelectFullScreen ,
273
272
_ => return None ,
274
273
} ;
275
274
0 commit comments