fix cycle_layout bug when state.focus_w == root

AdaShoelace · Aug 3, 2020 · f8402b2 · f8402b2
1 parent 43c01f8
commit f8402b2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/hdl_reactor.rs b/src/hdl_reactor.rs
@@ -265,7 +265,7 @@ impl HdlReactor {
     }
 
     pub fn unset_focus(&self, w: Window, ww: &WindowWrapper) {
-        self.lib.ungrab_all_buttons(w);
+        // self.lib.ungrab_all_buttons(w);
         self.lib.sync(false);
         self.lib.set_border_color(w, CONFIG.background_color);
         self.lib.resize_window(w, ww.get_size());

diff --git a/src/wm.rs b/src/wm.rs
@@ -309,9 +309,9 @@ pub fn reorder(state: &mut State) -> Option<()> {
         .cloned()
         .collect::<Vec<WindowWrapper>>();
 
-    if state.focus_w == state.lib.get_root() {
+    if state.focus_w == state.lib.get_root() && !windows.is_empty() {
         debug!("reorder focus is root");
-        return None;
+        state.focus_w = *mon.get_newest()?.0;
     }
 
     let rects = mon.reorder(state.focus_w, &windows);