diff --git a/src/shell/mod.rs b/src/shell/mod.rs index fda349e1..39d692e2 100644 --- a/src/shell/mod.rs +++ b/src/shell/mod.rs @@ -3880,11 +3880,11 @@ impl Shell { (initial_window_location, layer, workspace.handle) } else { let sticky_layer = self - .workspaces - .sets - .get_mut(&cursor_output) - .filter(|set| set.sticky_layer.mapped().any(|m| m == &old_mapped)) - .map(|set| &mut set.sticky_layer)?; + .workspaces + .sets + .get_mut(&cursor_output) + .filter(|set| set.sticky_layer.mapped().any(|m| m == &old_mapped)) + .map(|set| &mut set.sticky_layer)?; let elem_geo = sticky_layer.element_geometry(&old_mapped).unwrap(); let mut initial_window_location = elem_geo.loc.to_global(&cursor_output); diff --git a/src/wayland/protocols/keyboard_layout.rs b/src/wayland/protocols/keyboard_layout.rs index 51324658..f3a44f0a 100644 --- a/src/wayland/protocols/keyboard_layout.rs +++ b/src/wayland/protocols/keyboard_layout.rs @@ -52,15 +52,16 @@ impl KeyboardLayoutState { let mut keyboard_layouts = mem::take(&mut state.keyboard_layout_state().keyboard_layouts); for (keyboard_layout, last_layout) in &mut keyboard_layouts { if let Some(data) = keyboard_layout.data::>() - && let Some(handle) = &data.handle { - let active_layout = handle.with_xkb_state(state, |context| { - context.xkb().lock().unwrap().active_layout() - }); - if *last_layout != Some(active_layout) { - keyboard_layout.group(active_layout.0); - *last_layout = Some(active_layout); - } + && let Some(handle) = &data.handle + { + let active_layout = handle.with_xkb_state(state, |context| { + context.xkb().lock().unwrap().active_layout() + }); + if *last_layout != Some(active_layout) { + keyboard_layout.group(active_layout.0); + *last_layout = Some(active_layout); } + } } state.keyboard_layout_state().keyboard_layouts = keyboard_layouts; }