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

shell: next_focus should use active_output

Browse source
This commit is contained in:
Victoria Brekenfeld 2024-09-09 20:02:12 +02:00
parent b85b8fc7eb
commit f0f1db4358
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/shell/mod.rs
View file

@ -17,8 +17,8 @@ use cosmic_comp_config::{
use cosmic_protocols::workspace::v1::server::zcosmic_workspace_handle_v1::{ use cosmic_protocols::workspace::v1::server::zcosmic_workspace_handle_v1::{
State as WState, TilingState, State as WState, TilingState,
}; };
use cosmic_settings_config::{shortcuts, window_rules::ApplicationException};
use cosmic_settings_config::shortcuts::action::{Direction, FocusDirection, ResizeDirection}; use cosmic_settings_config::shortcuts::action::{Direction, FocusDirection, ResizeDirection};
use cosmic_settings_config::{shortcuts, window_rules::ApplicationException};
use keyframe::{ease, functions::EaseInOutCubic}; use keyframe::{ease, functions::EaseInOutCubic};
use smithay::{ use smithay::{
backend::{input::TouchSlot, renderer::element::RenderElementStates}, backend::{input::TouchSlot, renderer::element::RenderElementStates},
@ -2825,9 +2825,8 @@ impl Shell {
let Some(target) = seat.get_keyboard().unwrap().current_focus() else { let Some(target) = seat.get_keyboard().unwrap().current_focus() else {
return FocusResult::None; return FocusResult::None;
}; };
let output = self.get_focused_output(&target).unwrap(); let output = seat.active_output();
let workspace = self.active_space(&output);
let workspace = self.active_space(output);
if workspace.fullscreen.is_some() { if workspace.fullscreen.is_some() {
return FocusResult::None; return FocusResult::None;
@ -2837,7 +2836,7 @@ impl Shell {
return FocusResult::None; return FocusResult::None;
} }
let set = self.workspaces.sets.get(output).unwrap(); let set = self.workspaces.sets.get(&output).unwrap();
let sticky_layer = &set.sticky_layer; let sticky_layer = &set.sticky_layer;
let workspace = &set.workspaces[set.active]; let workspace = &set.workspaces[set.active];
@ -3574,7 +3573,7 @@ impl Shell {
pub fn update_tiling_exceptions<'a, I>(&mut self, exceptions: I) pub fn update_tiling_exceptions<'a, I>(&mut self, exceptions: I)
where where
I: Iterator<Item=&'a ApplicationException> I: Iterator<Item = &'a ApplicationException>,
{ {
self.tiling_exceptions = layout::TilingExceptions::new(exceptions); self.tiling_exceptions = layout::TilingExceptions::new(exceptions);
} }