leyoda/cosmic-comp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Run cargo fmt

Browse source
This commit is contained in:
Ian Douglas Scott 2024-01-17 13:12:46 -08:00 • committed by Victoria Brekenfeld
parent 44bf1c316f
commit 9b98c20da2
1 changed files with 10 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/input/mod.rs
View file

@ -474,7 +474,7 @@ impl State {
if is_grabbed if is_grabbed
&& handle.modified_sym() == Keysym::Escape && handle.modified_sym() == Keysym::Escape
&& state == KeyState::Pressed && state == KeyState::Pressed
&& !modifiers.alt && !modifiers.alt
&& !modifiers.ctrl && !modifiers.ctrl
&& !modifiers.logo && !modifiers.logo
&& !modifiers.shift && !modifiers.shift
@ -1165,12 +1165,8 @@ impl State {
.position_transformed(geometry.size.as_logical()) .position_transformed(geometry.size.as_logical())
.as_global(); .as_global();
let under = State::surface_under( let under = State::surface_under(position, &output, &mut self.common.shell)
position, .map(|(target, pos)| (target, pos.as_logical()));
&output,
&mut self.common.shell,
)
.map(|(target, pos)| (target, pos.as_logical()));
if let Some((target, pos)) = under { if let Some((target, pos)) = under {
if let Some(wl_surface) = target.wl_surface() { if let Some(wl_surface) = target.wl_surface() {
@ -1200,12 +1196,8 @@ impl State {
.position_transformed(geometry.size.as_logical()) .position_transformed(geometry.size.as_logical())
.as_global(); .as_global();
let under = State::surface_under( let under = State::surface_under(position, &output, &mut self.common.shell)
position, .map(|(target, pos)| (target, pos.as_logical()));
&output,
&mut self.common.shell,
)
.map(|(target, pos)| (target, pos.as_logical()));
if let Some((_target, pos)) = under { if let Some((_target, pos)) = under {
let touch = seat.get_touch().unwrap(); let touch = seat.get_touch().unwrap();
@ -1243,12 +1235,8 @@ impl State {
.as_global() .as_global()
+ geometry.loc.to_f64(); + geometry.loc.to_f64();
let under = State::surface_under( let under = State::surface_under(position, &output, &mut self.common.shell)
position, .map(|(target, pos)| (target, pos.as_logical()));
&output,
&mut self.common.shell,
)
.map(|(target, pos)| (target, pos.as_logical()));
let pointer = seat.get_pointer().unwrap(); let pointer = seat.get_pointer().unwrap();
pointer.motion( pointer.motion(
@ -1308,12 +1296,8 @@ impl State {
.as_global() .as_global()
+ geometry.loc.to_f64(); + geometry.loc.to_f64();
let under = State::surface_under( let under = State::surface_under(position, &output, &mut self.common.shell)
position, .map(|(target, pos)| (target, pos.as_logical()));
&output,
&mut self.common.shell,
)
.map(|(target, pos)| (target, pos.as_logical()));
let pointer = seat.get_pointer().unwrap(); let pointer = seat.get_pointer().unwrap();
pointer.motion( pointer.motion(
@ -1947,10 +1931,7 @@ impl State {
} }
} }
Action::Focus(focus) => { Action::Focus(focus) => {
let result = self.common.shell.next_focus( let result = self.common.shell.next_focus(focus, seat);
focus,
seat,
);
match result { match result {
FocusResult::None => { FocusResult::None => {