Update to cursive-core 0.3.0

Author: gyscos

Cargo.toml

@@ -11,13 +11,13 @@ repository = "https://github.com/deinstapel/cursive-multiplex"
 version = "0.5.2-alpha.0"
 
 [dependencies]
-cursive_core = "0.2"
+cursive_core = "0.3"
 thiserror = "1.0"
 indextree = "4.3"
 log = "0.4"
 
 [dev-dependencies]
 crossbeam = "0.8"
-cursive = "0.16"
+cursive = "0.17"
 serde_json = "1.0"
 insta = "1.7"

src/actions.rs

@@ -45,9 +45,9 @@ impl Mux {
                 // Traverse the path down again
                 if let Some(focus) = self.traverse_search_path(path, turn_point, direction, origin)
                 {
-                    if self.tree.get_mut(focus).unwrap().get_mut().take_focus() {
+                    if let Ok(result) = self.tree.get_mut(focus).unwrap().get_mut().take_focus() {
                         self.focus = focus;
-                        EventResult::Consumed(None)
+                        EventResult::Consumed(None).and(result)
                     } else {
                         // rejected
                         self.move_focus_relative(direction, focus, origin)

src/id.rs

@@ -229,7 +229,16 @@ impl Mux {
             debug!("Changed order");
         }
 
-        if self.tree.get_mut(new_node).unwrap().get_mut().take_focus() {
+        if self
+            .tree
+            .get_mut(new_node)
+            .unwrap()
+            .get_mut()
+            .take_focus()
+            .is_ok()
+        {
+            // Here we discard the potential callback from the focused view.
+            // Ideally we would bubble it up so it can be processed.
             self.focus = new_node;
             debug!("Changed Focus: {}", new_node);
         }

src/lib.rs

@@ -42,7 +42,7 @@ mod path;
 
 use cursive_core::direction::{Absolute, Direction};
 use cursive_core::event::{AnyCb, Event, EventResult, Key, MouseButton, MouseEvent};
-use cursive_core::view::{Selector, View, ViewNotFound};
+use cursive_core::view::{CannotFocus, Selector, View, ViewNotFound};
 use cursive_core::{Printer, Vec2};
 pub use error::*;
 pub use id::Id;
@@ -111,12 +111,12 @@ impl View for Mux {
         }
     }
 
-    fn take_focus(&mut self, _source: Direction) -> bool {
-        true
+    fn take_focus(&mut self, _source: Direction) -> Result<EventResult, CannotFocus> {
+        Ok(EventResult::consumed())
     }
 
-    fn focus_view(&mut self, _: &Selector) -> Result<(), ViewNotFound> {
-        Ok(())
+    fn focus_view(&mut self, _: &Selector) -> Result<EventResult, ViewNotFound> {
+        Ok(EventResult::consumed())
     }
 
     fn call_on_any<'a>(&mut self, slct: &Selector, cb: AnyCb<'a>) {
@@ -130,6 +130,7 @@ impl View for Mux {
 
     fn on_event(&mut self, evt: Event) -> EventResult {
         // pre_check if focus has to be changed, we dont want views react to mouse click out of their reach
+        let mut result = EventResult::Ignored;
         if let Event::Mouse {
             offset,
             position,
@@ -138,20 +139,23 @@ impl View for Mux {
         {
             if let Some(off_pos) = position.checked_sub(offset) {
                 if let Some(pane) = self.clicked_pane(off_pos) {
-                    if self.tree.get_mut(pane).unwrap().get_mut().take_focus() && self.focus != pane
-                    {
-                        self.focus = pane;
-                        self.invalidated = true;
+                    if let Ok(res) = self.tree.get_mut(pane).unwrap().get_mut().take_focus() {
+                        if self.focus != pane {
+                            result = res;
+                            self.focus = pane;
+                            self.invalidated = true;
+                        }
                     }
                 }
             }
         }
-        let result = self
-            .tree
-            .get_mut(self.focus)
-            .unwrap()
-            .get_mut()
-            .on_event(evt.clone(), self.zoomed);
+        let result = result.and(
+            self.tree
+                .get_mut(self.focus)
+                .unwrap()
+                .get_mut()
+                .on_event(evt.clone(), self.zoomed),
+        );
         match result {
             EventResult::Ignored => match evt {
                 _ if self.focus_left == evt => self.move_focus(Absolute::Left),

src/node.rs

@@ -1,6 +1,7 @@
 use crate::error::RenderError;
 use crate::{AnyCb, Direction, Event, EventResult, Orientation, Printer, Selector, Vec2, View};
 use cursive_core::direction::Absolute;
+use cursive_core::view::CannotFocus;
 
 pub(crate) struct Node {
     pub(crate) view: Option<Box<dyn View>>,
@@ -159,11 +160,11 @@ impl Node {
         }
     }
 
-    pub(crate) fn take_focus(&mut self) -> bool {
+    pub(crate) fn take_focus(&mut self) -> Result<EventResult, CannotFocus> {
         if let Some(view) = self.view.as_mut() {
             view.take_focus(Direction::none())
         } else {
-            false
+            Err(CannotFocus)
         }
     }