mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-03 17:44:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

WIP

Browse source
This commit is contained in:
Antonio Scandurra 2023-12-18 18:43:22 +01:00
parent 2330256741
commit be3c0ff419
2 changed files with 60 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
crates/gpui2/src/elements/div.rs
View file

@ -1221,8 +1221,10 @@ impl Interactivity {
});
}
dbg!("!!!!!!!!!!!!");
let interactive_bounds = interactive_bounds.clone();
cx.on_mouse_event(move |event: &MouseUpEvent, phase, cx| {
dbg!("hey");
if phase == DispatchPhase::Bubble
&& interactive_bounds.visibly_contains(&event.position, cx)
{
@ -1257,6 +1259,7 @@ impl Interactivity {
&global_element_id,
|element_state, _cx| {
if let Some(element_state) = element_state {
dbg!("setting pending mouse down");
element_state.pending_mouse_down = Some(event.clone());
}
},
@ -1507,8 +1510,10 @@ impl Interactivity {
cx.with_element_id(self.element_id.clone(), |global_element_id, cx| {
if let Some(global_element_id) = global_element_id {
cx.with_element_state(&global_element_id, |element_state, cx| {
let mut element_state =
element_state.get_or_insert_with(Box::<InteractiveElementState>::default);
let mut element_state = element_state.get_or_insert_with(|| {
println!("default InteractiveElementState");
Box::<InteractiveElementState>::default()
});
f(self, Some((&global_element_id, &mut element_state)), cx)
})
} else {

89
crates/gpui2/src/window.rs
View file

@ -2078,8 +2078,8 @@ pub trait BorrowWindow: BorrowMut<Window> + BorrowMut<AppContext> {
where
S: 'static,
{
let mut state = self
.window_mut()
let state = if self.window_mut().drawing {
self.window_mut()
.next_frame
.element_states
.remove(global_element_id)
@ -2088,48 +2088,65 @@ pub trait BorrowWindow: BorrowMut<Window> + BorrowMut<AppContext> {
.rendered_frame
.element_states
.remove(global_element_id)
}).map(|any| {
let ElementStateBox {
inner,
})
} else {
self.window_mut()
.rendered_frame
.element_states
.remove(global_element_id)
};
let mut state = state
.map(|any| {
let ElementStateBox {
inner,
#[cfg(debug_assertions)]
type_name,
} = any;
inner
.downcast::<S>()
.map_err(|_| {
#[cfg(debug_assertions)]
type_name
} = any;
inner
.downcast::<S>()
.map_err(|_| {
#[cfg(debug_assertions)]
{
anyhow!(
"invalid element state type for id, requested_type {:?}, actual type: {:?}",
std::any::type_name::<S>(),
type_name
)
}
{
anyhow!(
"invalid element state type for id, requested_type {:?}, actual type: {:?}",
std::any::type_name::<S>(),
type_name
)
}
#[cfg(not(debug_assertions))]
{
anyhow!(
"invalid element state type for id, requested_type {:?}",
std::any::type_name::<S>(),
)
}
})
.unwrap()
});
#[cfg(not(debug_assertions))]
{
anyhow!(
"invalid element state type for id, requested_type {:?}",
std::any::type_name::<S>(),
)
}
})
.unwrap()
});
let result = f(&mut state, self);
if let Some(state) = state {
self.window_mut().next_frame.element_states.insert(
global_element_id.clone(),
ElementStateBox {
inner: state,
let state = ElementStateBox {
inner: state,
#[cfg(debug_assertions)]
type_name: std::any::type_name::<S>(),
},
);
#[cfg(debug_assertions)]
type_name: std::any::type_name::<S>(),
};
if self.window().drawing {
self.window_mut()
.next_frame
.element_states
.insert(global_element_id.clone(), state);
} else {
self.window_mut()
.rendered_frame
.element_states
.insert(global_element_id.clone(), state);
}
}
result