mixa/zed
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Checkpoint

Browse Source
This commit is contained in:
Antonio Scandurra
2023-10-19 23:35:09 +02:00
parent 1f6d9369d6
commit 4a6c8ff809
4 changed files with 35 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
crates/gpui3/src/element.rs
View File

@@ -85,7 +85,7 @@ pub trait ElementInteractivity<V: 'static + Send + Sync>: 'static + Send + Sync
&self,
style: &mut Style,
bounds: Bounds<Pixels>,
active_state: &Mutex<InteractiveElementState>,
element_state: &InteractiveElementState,
cx: &mut ViewContext<V>,
) {
let mouse_position = cx.mouse_position();
@@ -102,7 +102,7 @@ pub trait ElementInteractivity<V: 'static + Send + Sync>: 'static + Send + Sync
}
if let Some(stateful) = self.as_stateful() {
let active_state = active_state.lock();
let active_state = element_state.active_state.lock();
if active_state.group {
if let Some(group_style) = stateful.group_active_style.as_ref() {
style.refine(&group_style.style);
@@ -117,8 +117,7 @@ pub trait ElementInteractivity<V: 'static + Send + Sync>: 'static + Send + Sync
fn paint(
&mut self,
bounds: Bounds<Pixels>,
pending_click: Arc<Mutex<Option<MouseDownEvent>>>,
interactive_state: Arc<Mutex<InteractiveElementState>>,
element_state: &InteractiveElementState,
cx: &mut ViewContext<V>,
) {
let stateless = self.as_stateless();
@@ -162,6 +161,7 @@ pub trait ElementInteractivity<V: 'static + Send + Sync>: 'static + Send + Sync
if let Some(stateful) = self.as_stateful() {
let click_listeners = stateful.mouse_click_listeners.clone();
let pending_click = element_state.pending_click.clone();
let mouse_down = pending_click.lock().clone();
if let Some(mouse_down) = mouse_down {
cx.on_mouse_event(move |state, event: &MouseUpEvent, phase, cx| {
@@ -185,7 +185,8 @@ pub trait ElementInteractivity<V: 'static + Send + Sync>: 'static + Send + Sync
});
}
if interactive_state.lock().is_none() {
let active_state = element_state.active_state.clone();
if active_state.lock().is_none() {
let active_group_bounds = stateful
.group_active_style
.as_ref()
@@ -196,7 +197,7 @@ pub trait ElementInteractivity<V: 'static + Send + Sync>: 'static + Send + Sync
.map_or(false, |bounds| bounds.contains_point(&down.position));
let element = bounds.contains_point(&down.position);
if group || element {
*interactive_state.lock() = InteractiveElementState { group, element };
*active_state.lock() = ActiveState { group, element };
cx.notify();
}
}
@@ -204,7 +205,7 @@ pub trait ElementInteractivity<V: 'static + Send + Sync>: 'static + Send + Sync
} else {
cx.on_mouse_event(move |_, _: &MouseUpEvent, phase, cx| {
if phase == DispatchPhase::Capture {
*interactive_state.lock() = InteractiveElementState::default();
*active_state.lock() = ActiveState::default();
cx.notify();
}
});
@@ -319,17 +320,23 @@ impl GroupBounds {
}
#[derive(Copy, Clone, Default, Eq, PartialEq)]
pub struct InteractiveElementState {
struct ActiveState {
pub group: bool,
pub element: bool,
}
impl InteractiveElementState {
impl ActiveState {
pub fn is_none(&self) -> bool {
!self.group && !self.element
}
}
#[derive(Default)]
pub struct InteractiveElementState {
active_state: Arc<Mutex<ActiveState>>,
pending_click: Arc<Mutex<Option<MouseDownEvent>>>,
}
impl<V> Default for StatelessInteractivity<V> {
fn default() -> Self {
Self {

25
crates/gpui3/src/elements/div.rs
View File

@@ -2,21 +2,15 @@ use crate::{
Active, AnyElement, BorrowWindow, Bounds, Element, ElementFocusability, ElementId,
ElementInteractivity, Focus, FocusHandle, FocusListeners, Focusable, GlobalElementId,
GroupBounds, GroupStyle, Hover, InteractiveElementState, IntoAnyElement, LayoutId,
MouseDownEvent, NonFocusable, Overflow, ParentElement, Pixels, Point, SharedString,
StatefulInteractivity, StatefullyInteractive, StatelessInteractivity, StatelesslyInteractive,
Style, StyleRefinement, Styled, ViewContext,
NonFocusable, Overflow, ParentElement, Pixels, Point, SharedString, StatefulInteractivity,
StatefullyInteractive, StatelessInteractivity, StatelesslyInteractive, Style, StyleRefinement,
Styled, ViewContext,
};
use parking_lot::Mutex;
use refineable::Refineable;
use smallvec::SmallVec;
use std::sync::Arc;
#[derive(Default)]
pub struct DivState {
active_state: Arc<Mutex<InteractiveElementState>>,
pending_click: Arc<Mutex<Option<MouseDownEvent>>>,
}
#[derive(Default, Clone)]
pub struct ScrollState(Arc<Mutex<Point<Pixels>>>);
@@ -148,14 +142,14 @@ where
pub fn compute_style(
&self,
bounds: Bounds<Pixels>,
state: &DivState,
state: &InteractiveElementState,
cx: &mut ViewContext<V>,
) -> Style {
let mut computed_style = Style::default();
computed_style.refine(&self.base_style);
self.focusability.refine_style(&mut computed_style, cx);
self.interactivity
.refine_style(&mut computed_style, bounds, &state.active_state, cx);
.refine_style(&mut computed_style, bounds, state, cx);
computed_style
}
}
@@ -209,7 +203,7 @@ where
V: 'static + Send + Sync,
{
type ViewState = V;
type ElementState = DivState;
type ElementState = InteractiveElementState;
fn id(&self) -> Option<ElementId> {
self.interactivity
@@ -273,12 +267,7 @@ where
style.paint(bounds, cx);
this.focusability.paint(bounds, cx);
this.interactivity.paint(
bounds,
element_state.pending_click.clone(),
element_state.active_state.clone(),
cx,
);
this.interactivity.paint(bounds, element_state, cx);
});
cx.stack(1, |cx| {

11
crates/gpui3/src/elements/img.rs
View File

@@ -1,8 +1,9 @@
use crate::{
div, Active, AnyElement, BorrowWindow, Bounds, Div, DivState, Element, ElementFocusability,
ElementId, ElementInteractivity, Focus, FocusListeners, Focusable, Hover, IntoAnyElement,
LayoutId, NonFocusable, Pixels, SharedString, StatefulInteractivity, StatefullyInteractive,
StatelessInteractivity, StatelesslyInteractive, StyleRefinement, Styled, ViewContext,
div, Active, AnyElement, BorrowWindow, Bounds, Div, Element, ElementFocusability, ElementId,
ElementInteractivity, Focus, FocusListeners, Focusable, Hover, InteractiveElementState,
IntoAnyElement, LayoutId, NonFocusable, Pixels, SharedString, StatefulInteractivity,
StatefullyInteractive, StatelessInteractivity, StatelesslyInteractive, StyleRefinement, Styled,
ViewContext,
};
use futures::FutureExt;
use util::ResultExt;
@@ -77,7 +78,7 @@ where
F: ElementFocusability<V>,
{
type ViewState = V;
type ElementState = DivState;
type ElementState = InteractiveElementState;
fn id(&self) -> Option<crate::ElementId> {
self.base.id()

11
crates/gpui3/src/elements/svg.rs
View File

@@ -1,8 +1,9 @@
use crate::{
div, Active, AnyElement, Bounds, Div, DivState, Element, ElementFocusability, ElementId,
ElementInteractivity, Focus, FocusListeners, Focusable, Hover, IntoAnyElement, LayoutId,
NonFocusable, Pixels, SharedString, StatefulInteractivity, StatefullyInteractive,
StatelessInteractivity, StatelesslyInteractive, StyleRefinement, Styled, ViewContext,
div, Active, AnyElement, Bounds, Div, Element, ElementFocusability, ElementId,
ElementInteractivity, Focus, FocusListeners, Focusable, Hover, InteractiveElementState,
IntoAnyElement, LayoutId, NonFocusable, Pixels, SharedString, StatefulInteractivity,
StatefullyInteractive, StatelessInteractivity, StatelesslyInteractive, StyleRefinement, Styled,
ViewContext,
};
use util::ResultExt;
@@ -68,7 +69,7 @@ where
F: ElementFocusability<V>,
{
type ViewState = V;
type ElementState = DivState;
type ElementState = InteractiveElementState;
fn id(&self) -> Option<crate::ElementId> {
self.base.id()