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

Fix #120

Browse source
This commit is contained in:
Victoria Brekenfeld 2023-05-26 12:47:39 +02:00
parent 06ac701349
commit b1e39452d0
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/shell/focus/mod.rs
View file

@ -147,12 +147,12 @@ impl Shell {
for output in self.outputs.iter() { for output in self.outputs.iter() {
let workspace = self.workspaces.active_mut(output); let workspace = self.workspaces.active_mut(output);
for focused in focused_windows.iter() { for focused in focused_windows.iter() {
if workspace.floating_layer.mapped().any(|m| m == focused) { if let CosmicSurface::X11(window) = focused.active_window() {
if let CosmicSurface::X11(window) = focused.active_window() { if let Some(xwm) = xwm.as_mut().and_then(|state| state.xwm.as_mut()) {
if let Some(xwm) = xwm.as_mut().and_then(|state| state.xwm.as_mut()) { let _ = xwm.raise_window(&window);
let _ = xwm.raise_window(&window);
}
} }
}
if workspace.floating_layer.mapped().any(|m| m == focused) {
workspace.floating_layer.space.raise_element(focused, true); workspace.floating_layer.space.raise_element(focused, true);
} }
} }

4
src/shell/mod.rs
View file

@ -1207,14 +1207,14 @@ impl Shell {
.map(mapped.clone(), &seat, focus_stack.iter(), None); .map(mapped.clone(), &seat, focus_stack.iter(), None);
} }
if let CosmicSurface::X11(_) = window { if let CosmicSurface::X11(surface) = window {
if let Some(xwm) = state if let Some(xwm) = state
.common .common
.xwayland_state .xwayland_state
.as_mut() .as_mut()
.and_then(|state| state.xwm.as_mut()) .and_then(|state| state.xwm.as_mut())
{ {
if let Err(err) = xwm.update_stacking_order_downwards(workspace.mapped()) { if let Err(err) = xwm.raise_window(&surface) {
warn!(?err, "Failed to update Xwayland stacking order."); warn!(?err, "Failed to update Xwayland stacking order.");
} }
} }