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

Merge pull request #184 from pop-os/focus-across-monitors_jammy

Browse source 
Fix NextOutput and PreviousOutput when Shell::activate returns None
This commit is contained in:
Victoria Brekenfeld 2023-09-29 19:09:13 +02:00 • committed by GitHub
commit 0b057f153e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 36 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/input/mod.rs
View file

@ -1187,7 +1187,8 @@ impl State {
.cloned() .cloned()
{ {
let idx = self.common.shell.workspaces.active_num(&next_output).1; let idx = self.common.shell.workspaces.active_num(&next_output).1;
if let Ok(Some(new_pos)) = self.common.shell.activate(&next_output, idx) { match self.common.shell.activate(&next_output, idx) {
Ok(Some(new_pos)) => {
seat.set_active_output(&next_output); seat.set_active_output(&next_output);
if let Some(ptr) = seat.get_pointer() { if let Some(ptr) = seat.get_pointer() {
ptr.motion( ptr.motion(
@ -1201,6 +1202,11 @@ impl State {
); );
} }
} }
Ok(None) => {
seat.set_active_output(&next_output);
}
_ => {}
}
} }
} }
Action::PreviousOutput => { Action::PreviousOutput => {
@ -1217,7 +1223,8 @@ impl State {
.cloned() .cloned()
{ {
let idx = self.common.shell.workspaces.active_num(&prev_output).1; let idx = self.common.shell.workspaces.active_num(&prev_output).1;
if let Ok(Some(new_pos)) = self.common.shell.activate(&prev_output, idx) { match self.common.shell.activate(&prev_output, idx) {
Ok(Some(new_pos)) => {
seat.set_active_output(&prev_output); seat.set_active_output(&prev_output);
if let Some(ptr) = seat.get_pointer() { if let Some(ptr) = seat.get_pointer() {
ptr.motion( ptr.motion(
@ -1231,6 +1238,11 @@ impl State {
); );
} }
} }
Ok(None) => {
seat.set_active_output(&prev_output);
}
_ => {}
}
} }
} }
x @ Action::MoveToNextOutput | x @ Action::SendToNextOutput => { x @ Action::MoveToNextOutput | x @ Action::SendToNextOutput => {