Register actions on the right div

Antonio Scandurra created 2 years ago

Change summary

crates/gpui2/src/keymap/context.rs  | 20 +++++++++++++++++++-
crates/workspace2/src/workspace2.rs | 15 ++++++++-------
2 files changed, 27 insertions(+), 8 deletions(-)

Detailed changes

crates/gpui2/src/keymap/context.rs

@@ -1,8 +1,9 @@
 use crate::SharedString;
 use anyhow::{anyhow, Result};
 use smallvec::SmallVec;
+use std::fmt;
 
-#[derive(Clone, Debug, Default, Eq, PartialEq, Hash)]
+#[derive(Clone, Default, Eq, PartialEq, Hash)]
 pub struct KeyContext(SmallVec<[ContextEntry; 8]>);
 
 #[derive(Clone, Debug, Eq, PartialEq, Hash)]
@@ -99,6 +100,23 @@ impl KeyContext {
     }
 }
 
+impl fmt::Debug for KeyContext {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let mut entries = self.0.iter().peekable();
+        while let Some(entry) = entries.next() {
+            if let Some(ref value) = entry.value {
+                write!(f, "{}={}", entry.key, value)?;
+            } else {
+                write!(f, "{}", entry.key)?;
+            }
+            if entries.peek().is_some() {
+                write!(f, " ")?;
+            }
+        }
+        Ok(())
+    }
+}
+
 #[derive(Clone, Debug, Eq, PartialEq, Hash)]
 pub enum KeyBindingContextPredicate {
     Identifier(SharedString),

crates/workspace2/src/workspace2.rs

@@ -39,7 +39,7 @@ use gpui::{
     actions, div, point, rems, size, Action, AnyModel, AnyView, AnyWeakView, AppContext,
     AsyncAppContext, AsyncWindowContext, Bounds, Component, Div, Entity, EntityId, EventEmitter,
     FocusHandle, GlobalPixels, KeyContext, Model, ModelContext, ParentElement, Point, Render, Size,
-    StatefulInteractive, StatefulInteractivity, StatelessInteractive, Styled, Subscription, Task,
+    StatefulInteractive, StatelessInteractive, StatelessInteractivity, Styled, Subscription, Task,
     View, ViewContext, VisualContext, WeakView, WindowBounds, WindowContext, WindowHandle,
     WindowOptions,
 };
@@ -534,8 +534,8 @@ pub struct Workspace {
     workspace_actions: Vec<
         Box<
             dyn Fn(
-                Div<Workspace, StatefulInteractivity<Workspace>>,
-            ) -> Div<Workspace, StatefulInteractivity<Workspace>>,
+                Div<Workspace, StatelessInteractivity<Workspace>>,
+            ) -> Div<Workspace, StatelessInteractivity<Workspace>>,
         >,
     >,
     zoomed: Option<AnyWeakView>,
@@ -3514,8 +3514,8 @@ impl Workspace {
 
     fn add_workspace_actions_listeners(
         &self,
-        mut div: Div<Workspace, StatefulInteractivity<Workspace>>,
-    ) -> Div<Workspace, StatefulInteractivity<Workspace>> {
+        mut div: Div<Workspace, StatelessInteractivity<Workspace>>,
+    ) -> Div<Workspace, StatelessInteractivity<Workspace>> {
         for action in self.workspace_actions.iter() {
             div = (action)(div)
         }
@@ -3746,7 +3746,7 @@ impl Render for Workspace {
         let mut context = KeyContext::default();
         context.add("Workspace");
 
-        div()
+        self.add_workspace_actions_listeners(div())
             .context(context)
             .relative()
             .size_full()
@@ -3761,7 +3761,8 @@ impl Render for Workspace {
             .child(self.render_titlebar(cx))
             .child(
                 // todo! should this be a component a view?
-                self.add_workspace_actions_listeners(div().id("workspace"))
+                div()
+                    .id("workspace")
                     .relative()
                     .flex_1()
                     .w_full()