Checkpoint

Antonio Scandurra created 2 years ago

Change summary

crates/gpui3/src/element.rs      |  3 -
crates/gpui3/src/elements/div.rs | 37 ++++++++++++++++++++++-----------
2 files changed, 25 insertions(+), 15 deletions(-)

Detailed changes

crates/gpui3/src/element.rs

@@ -1,4 +1,4 @@
-use crate::{BorrowWindow, Bounds, ElementId, LayoutId, Pixels, Point, SharedString, ViewContext};
+use crate::{BorrowWindow, Bounds, ElementId, LayoutId, Pixels, Point, ViewContext};
 use derive_more::{Deref, DerefMut};
 pub(crate) use smallvec::SmallVec;
 
@@ -48,7 +48,6 @@ impl ElementIdentity for AnonymousElement {
 
 pub trait ParentElement: Element {
     fn children_mut(&mut self) -> &mut SmallVec<[AnyElement<Self::ViewState>; 2]>;
-    fn group_mut(&mut self) -> &mut Option<SharedString>;
 
     fn child(mut self, child: impl IntoAnyElement<Self::ViewState>) -> Self
     where

crates/gpui3/src/elements/div.rs

@@ -2,7 +2,8 @@ use crate::{
     AnonymousElement, AnyElement, AppContext, BorrowWindow, Bounds, Clickable, DispatchPhase,
     Element, ElementId, ElementIdentity, IdentifiedElement, Interactive, IntoAnyElement, LayoutId,
     MouseClickEvent, MouseDownEvent, MouseEventListeners, MouseMoveEvent, MouseUpEvent, Overflow,
-    Pixels, Point, ScrollWheelEvent, SharedString, Style, StyleRefinement, Styled, ViewContext,
+    ParentElement, Pixels, Point, ScrollWheelEvent, SharedString, Style, StyleRefinement, Styled,
+    ViewContext,
 };
 use collections::HashMap;
 use parking_lot::Mutex;
@@ -112,18 +113,6 @@ where
     }
 }
 
-impl<V, K> Interactive for Div<V, K>
-where
-    V: 'static + Send + Sync,
-    K: ElementIdentity,
-{
-    fn listeners(&mut self) -> &mut MouseEventListeners<V> {
-        &mut self.listeners
-    }
-}
-
-impl<V> Clickable for Div<V, IdentifiedElement> where V: 'static + Send + Sync {}
-
 impl<V, K> Div<V, K>
 where
     V: 'static + Send + Sync,
@@ -430,6 +419,16 @@ where
     }
 }
 
+impl<V, K> ParentElement for Div<V, K>
+where
+    V: 'static + Send + Sync,
+    K: ElementIdentity,
+{
+    fn children_mut(&mut self) -> &mut SmallVec<[AnyElement<Self::ViewState>; 2]> {
+        &mut self.children
+    }
+}
+
 impl<V, K> Styled for Div<V, K>
 where
     V: 'static + Send + Sync,
@@ -440,6 +439,18 @@ where
     }
 }
 
+impl<V, K> Interactive for Div<V, K>
+where
+    V: 'static + Send + Sync,
+    K: ElementIdentity,
+{
+    fn listeners(&mut self) -> &mut MouseEventListeners<V> {
+        &mut self.listeners
+    }
+}
+
+impl<V> Clickable for Div<V, IdentifiedElement> where V: 'static + Send + Sync {}
+
 fn paint_hover_listener<V>(bounds: Bounds<Pixels>, cx: &mut ViewContext<V>)
 where
     V: 'static + Send + Sync,