Focus last entry in focus chain when going backwards from none.

linebender · Apr 10, 2020 · 310b690 · 310b690
1 parent fc9825e
commit 310b690
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/druid/src/window.rs b/druid/src/window.rs
@@ -351,8 +351,12 @@ impl<T: Data> Window<T> {
                 })
                 .or_else(|| {
                     // If the currently focused widget isn't in the focus chain,
-                    // then we'll just return the first entry of the chain, if any.
-                    self.focus_chain().first().copied()
+                    // then we'll just return the first/last entry of the chain, if any.
+                    if forward {
+                        self.focus_chain().first().copied()
+                    } else {
+                        self.focus_chain().last().copied()
+                    }
                 })
         })
     }