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

Fix focus issue

Browse source
This commit is contained in:
Darksome 2023-03-26 14:48:26 +04:00
parent 7ad37946d3
commit da13c36e9b
3 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

0
rustfmt.toml Normal file
View file

11
src/input/mod.rs
View file

@ -676,10 +676,7 @@ impl State {
0 => 9, 0 => 9,
x => x - 1, x => x - 1,
}; };
let _ = self Shell::activate_and_focus(self, seat, &current_output, workspace as usize)
.common
.shell
.activate(&current_output, workspace as usize);
} }
Action::NextWorkspace => { Action::NextWorkspace => {
let current_output = seat.active_output(); let current_output = seat.active_output();
@ -690,7 +687,7 @@ impl State {
.active_num(&current_output) .active_num(&current_output)
.saturating_add(1); .saturating_add(1);
// TODO: Possibly move to next output, if idx to large // TODO: Possibly move to next output, if idx to large
let _ = self.common.shell.activate(&current_output, workspace); Shell::activate_and_focus(self, seat, &current_output, workspace)
} }
Action::PreviousWorkspace => { Action::PreviousWorkspace => {
let current_output = seat.active_output(); let current_output = seat.active_output();
@ -701,7 +698,7 @@ impl State {
.active_num(&current_output) .active_num(&current_output)
.saturating_sub(1); .saturating_sub(1);
// TODO: Possibly move to prev output, if idx < 0 // TODO: Possibly move to prev output, if idx < 0
let _ = self.common.shell.activate(&current_output, workspace); Shell::activate_and_focus(self, seat, &current_output, workspace)
} }
Action::LastWorkspace => { Action::LastWorkspace => {
let current_output = seat.active_output(); let current_output = seat.active_output();
@ -711,7 +708,7 @@ impl State {
.workspaces .workspaces
.len(&current_output) .len(&current_output)
.saturating_sub(1); .saturating_sub(1);
let _ = self.common.shell.activate(&current_output, workspace); Shell::activate_and_focus(self, seat, &current_output, workspace)
} }
x @ Action::MoveToWorkspace(_) | x @ Action::SendToWorkspace(_) => { x @ Action::MoveToWorkspace(_) | x @ Action::SendToWorkspace(_) => {
let current_output = seat.active_output(); let current_output = seat.active_output();

13
src/shell/mod.rs
View file

@ -1176,6 +1176,19 @@ impl Shell {
} }
} }
pub fn activate_and_focus(state: &mut State, seat: &Seat<State>, output: &Output, idx: usize) {
let _ = state.common.shell.activate(output, idx);
// without this the last window of the target workspace may not receive focus when switching
// from a workspace having focused fullscreen window (there may be other cases).
let workspace = state.common.shell.active_space(output);
if let Some(mapped) = workspace.focus_stack.get(seat).last() {
// TODO: There should probably be a `KeyboardFocusTargetRef<'a>` to avoid unnecessary
// cloning.
Common::set_focus(state, Some(&(mapped.clone().into())), seat, None);
}
}
pub fn move_current_window( pub fn move_current_window(
state: &mut State, state: &mut State,
seat: &Seat<State>, seat: &Seat<State>,