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

shell: Fix global+static mode

Browse source
This commit is contained in:
Victoria Brekenfeld 2022-11-23 16:00:33 +01:00
parent 4a9afd0572
commit f4476b10f2
2 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/input/mod.rs
View file

@ -693,7 +693,6 @@ impl State {
.cloned() .cloned()
{ {
let idx = self.common.shell.workspaces.active_num(&prev_output); let idx = self.common.shell.workspaces.active_num(&prev_output);
seat.set_active_output(&prev_output);
if let Some(new_pos) = self.common.shell.activate(&prev_output, idx) { if let Some(new_pos) = self.common.shell.activate(&prev_output, idx) {
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() {

19
src/shell/mod.rs
View file

@ -1,5 +1,5 @@
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::HashMap; use std::{collections::HashMap, cell::RefCell};
use cosmic_protocols::workspace::v1::server::zcosmic_workspace_handle_v1::State as WState; use cosmic_protocols::workspace::v1::server::zcosmic_workspace_handle_v1::State as WState;
use smithay::{ use smithay::{
@ -20,7 +20,7 @@ use smithay::{
}; };
use crate::{ use crate::{
config::{Config, WorkspaceMode as ConfigMode}, config::{Config, WorkspaceMode as ConfigMode, OutputConfig},
utils::prelude::*, utils::prelude::*,
wayland::protocols::{ wayland::protocols::{
toplevel_info::ToplevelInfoState, toplevel_info::ToplevelInfoState,
@ -459,7 +459,13 @@ impl Shell {
// TODO: Restore any window positions from previous outputs ??? // TODO: Restore any window positions from previous outputs ???
state.add_group_output(&set.group, output); state.add_group_output(&set.group, output);
for workspace in &mut set.workspaces { for workspace in &mut set.workspaces {
workspace.map_output(output, output.current_location()); workspace.map_output(output, output.user_data()
.get::<RefCell<OutputConfig>>()
.unwrap()
.borrow()
.position
.into()
);
} }
} }
} }
@ -532,7 +538,12 @@ impl Shell {
if let WorkspaceMode::Global(set) = &mut self.workspaces { if let WorkspaceMode::Global(set) = &mut self.workspaces {
for workspace in &mut set.workspaces { for workspace in &mut set.workspaces {
for output in self.outputs.iter() { for output in self.outputs.iter() {
workspace.map_output(output, output.current_location()); workspace.map_output(output, output.user_data()
.get::<RefCell<OutputConfig>>()
.unwrap()
.borrow()
.position
.into());
} }
} }
} }