Antonio Scandurra created
crates/gpui3/src/elements/hoverable.rs | 5
crates/gpui3/src/elements/pressable.rs | 119 +---------------
crates/gpui3/src/text_system.rs | 4
crates/gpui3/src/text_system/text_layout_cache.rs | 2
crates/gpui3/src/window.rs | 15 +
5 files changed, 27 insertions(+), 118 deletions(-)
@@ -9,10 +9,7 @@ use std::sync::{
Arc,
};
-pub struct Hoverable<E: Styled>
-// where
-// <E::Style as Refineable>::Refinement: 'static + Send + Sync,
-{
+pub struct Hoverable<E: Styled> {
hovered: Arc<AtomicBool>,
cascade_slot: CascadeSlot,
hovered_style: <E::Style as Refineable>::Refinement,
@@ -60,6 +60,10 @@ where
type ViewState = E::ViewState;
type ElementState = PressableState<E::ElementState>;
+ fn element_id(&self) -> Option<crate::ElementId> {
+ Some(StatefulElement::element_id(&self.child))
+ }
+
fn layout(
&mut self,
state: &mut Self::ViewState,
@@ -103,7 +107,6 @@ where
cx.on_mouse_event(move |_, event: &MouseDownEvent, phase, cx| {
if phase == DispatchPhase::Capture {
if bounds.contains_point(event.position) {
- dbg!("pressed");
pressed.store(true, SeqCst);
cx.notify();
}
@@ -113,7 +116,6 @@ where
cx.on_mouse_event(move |_, _: &MouseUpEvent, phase, cx| {
if phase == DispatchPhase::Capture {
if pressed.load(SeqCst) {
- dbg!("released");
pressed.store(false, SeqCst);
cx.notify();
}
@@ -133,109 +135,10 @@ impl<E: ParentElement + Styled> ParentElement for Pressable<E> {
}
}
-// use crate::{
-// element::{AnyElement, Element, IntoElement, Layout, ParentElement},
-// interactive::{InteractionHandlers, Interactive},
-// style::{Style, StyleHelpers, Styleable},
-// ViewContext,
-// };
-// use anyhow::Result;
-// use gpui::{geometry::vector::Vector2F, platform::MouseButtonEvent, LayoutId};
-// use refineable::{CascadeSlot, Refineable, RefinementCascade};
-// use smallvec::SmallVec;
-// use std::{cell::Cell, rc::Rc};
-
-// pub struct Pressable<E: Styleable> {
-// pressed: Rc<Cell<bool>>,
-// pressed_style: <E::Style as Refineable>::Refinement,
-// cascade_slot: CascadeSlot,
-// child: E,
-// }
-
-// pub fn pressable<E: Styleable>(mut child: E) -> Pressable<E> {
-// Pressable {
-// pressed: Rc::new(Cell::new(false)),
-// pressed_style: Default::default(),
-// cascade_slot: child.style_cascade().reserve(),
-// child,
-// }
-// }
-
-// impl<E: Styleable> Styleable for Pressable<E> {
-// type Style = E::Style;
-
-// fn declared_style(&mut self) -> &mut <Self::Style as Refineable>::Refinement {
-// &mut self.pressed_style
-// }
-
-// fn style_cascade(&mut self) -> &mut RefinementCascade<E::Style> {
-// self.child.style_cascade()
-// }
-// }
-
-// impl<V: 'static, E: Element<V> + Styleable> Element<V> for Pressable<E> {
-// type PaintState = E::PaintState;
-
-// fn layout(
-// &mut self,
-// view: &mut V,
-// cx: &mut ViewContext<V>,
-// ) -> Result<(LayoutId, Self::PaintState)>
-// where
-// Self: Sized,
-// {
-// self.child.layout(view, cx)
-// }
-
-// fn paint(
-// &mut self,
-// view: &mut V,
-// parent_origin: Vector2F,
-// layout: &Layout,
-// paint_state: &mut Self::PaintState,
-// cx: &mut ViewContext<V>,
-// ) where
-// Self: Sized,
-// {
-// let slot = self.cascade_slot;
-// let style = self.pressed.get().then_some(self.pressed_style.clone());
-// self.style_cascade().set(slot, style);
-
-// let pressed = self.pressed.clone();
-// let bounds = layout.bounds + parent_origin;
-// cx.on_event(layout.order, move |_view, event: &MouseButtonEvent, cx| {
-// if event.is_down {
-// if bounds.contains_point(event.position) {
-// pressed.set(true);
-// cx.repaint();
-// }
-// } else if pressed.get() {
-// pressed.set(false);
-// cx.repaint();
-// }
-// });
-
-// self.child
-// .paint(view, parent_origin, layout, paint_state, cx);
-// }
-// }
-
-// impl<V: 'static, E: Interactive<V> + Styleable> Interactive<V> for Pressable<E> {
-// fn interaction_handlers(&mut self) -> &mut InteractionHandlers<V> {
-// self.child.interaction_handlers()
-// }
-// }
-
-// impl<V: 'static, E: ParentElement<V> + Styleable> ParentElement<V> for Pressable<E> {
-// fn children_mut(&mut self) -> &mut SmallVec<[AnyElement<V>; 2]> {
-// self.child.children_mut()
-// }
-// }
-
-// impl<V: 'static, E: Element<V> + Styleable> IntoElement<V> for Pressable<E> {
-// type Element = Self;
-
-// fn into_element(self) -> Self::Element {
-// self
-// }
-// }
+impl<E> StatefulElement for Pressable<E>
+where
+ E: StatefulElement + Styled,
+ <E as Styled>::Style: 'static + Refineable + Send + Sync + Default,
+ <<E as Styled>::Style as Refineable>::Refinement: 'static + Refineable + Send + Sync + Default,
+{
+}
@@ -173,8 +173,8 @@ impl TextSystem {
Ok(Line::new(layout.clone(), runs))
}
- pub fn finish_frame(&self) {
- self.text_layout_cache.finish_frame()
+ pub fn end_frame(&self) {
+ self.text_layout_cache.end_frame()
}
pub fn line_wrapper(
@@ -23,7 +23,7 @@ impl TextLayoutCache {
}
}
- pub fn finish_frame(&self) {
+ pub fn end_frame(&self) {
let mut prev_frame = self.prev_frame.lock();
let mut curr_frame = self.curr_frame.write();
std::mem::swap(&mut *prev_frame, &mut *curr_frame);
@@ -606,8 +606,9 @@ impl<'a, 'w> WindowContext<'a, 'w> {
};
cx.window.root_view = Some(root_view);
-
let scene = cx.window.scene_builder.build();
+ cx.end_frame();
+
cx.run_on_main(view, |_, cx| {
cx.window
.platform_window
@@ -650,6 +651,10 @@ impl<'a, 'w> WindowContext<'a, 'w> {
.for_each(Vec::clear);
}
+ fn end_frame(&mut self) {
+ self.text_system().end_frame();
+ }
+
fn dispatch_event(&mut self, event: Event) -> bool {
if let Some(any_mouse_event) = event.mouse_event() {
if let Some(MouseMoveEvent { position, .. }) = any_mouse_event.downcast_ref() {
@@ -791,7 +796,7 @@ pub trait BorrowWindow: BorrowAppContext {
self.window_mut().element_id_stack.push(id);
let global_id = self.window_mut().element_id_stack.clone();
- if let Some(any) = self
+ let result = if let Some(any) = self
.window_mut()
.element_states
.remove(&global_id)
@@ -816,7 +821,11 @@ pub trait BorrowWindow: BorrowAppContext {
.element_states
.insert(global_id, Box::new(Some(state)));
result
- }
+ };
+
+ self.window_mut().element_id_stack.pop();
+
+ result
}
fn content_mask(&self) -> ContentMask<Pixels> {