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

Revert "Fix focus issue"

Browse source 
This reverts commit da13c36e9b.
This commit is contained in:
Darksome 2023-04-01 20:35:29 +04:00
parent da13c36e9b
commit 32805d8ee0
3 changed files with 7 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

0
rustfmt.toml
View file

11
src/input/mod.rs
View file

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

13
src/shell/mod.rs
View file

@ -1176,19 +1176,6 @@ 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(
state: &mut State,
seat: &Seat<State>,