This commit is contained in:
Antonio Scandurra
2023-10-30 19:33:23 +01:00
parent b9ce186d21
commit 9688937468
5 changed files with 127 additions and 59 deletions
+24 -12
View File
@@ -1,7 +1,7 @@
use crate::{
AnyBox, AnyElement, AvailableSpace, BorrowWindow, Bounds, Component, Element, ElementId,
EntityId, Flatten, Handle, LayoutId, Pixels, Size, ViewContext, VisualContext, WeakHandle,
WindowContext,
AnyBox, AnyElement, AppContext, AvailableSpace, BorrowWindow, Bounds, Component, Element,
ElementId, EntityHandle, EntityId, Flatten, Handle, LayoutId, Pixels, Size, ViewContext,
VisualContext, WeakHandle, WindowContext,
};
use anyhow::{Context, Result};
use parking_lot::Mutex;
@@ -31,9 +31,7 @@ impl<V: 'static> View<V> {
)),
}
}
}
impl<V: 'static> View<V> {
pub fn into_any(self) -> AnyView {
AnyView(Arc::new(self))
}
@@ -44,9 +42,7 @@ impl<V: 'static> View<V> {
render: Arc::downgrade(&self.render),
}
}
}
impl<V: 'static> View<V> {
pub fn update<C, R>(
&self,
cx: &mut C,
@@ -58,11 +54,8 @@ impl<V: 'static> View<V> {
cx.update_view(self, f)
}
pub fn read<C>(&self, cx: &mut C) -> &V
where
C: VisualContext,
{
todo!()
pub fn read<'a>(&self, cx: &'a AppContext) -> &'a V {
cx.entities.read(&self.state)
}
}
@@ -124,6 +117,25 @@ impl<V: 'static> Element<()> for View<V> {
}
}
impl<T: 'static> EntityHandle<T> for View<T> {
type Weak = WeakView<T>;
fn entity_id(&self) -> EntityId {
self.state.entity_id
}
fn downgrade(&self) -> Self::Weak {
self.downgrade()
}
fn upgrade_from(weak: &Self::Weak) -> Option<Self>
where
Self: Sized,
{
weak.upgrade()
}
}
pub struct WeakView<V> {
pub(crate) state: WeakHandle<V>,
render: Weak<Mutex<dyn Fn(&mut V, &mut ViewContext<V>) -> AnyElement<V> + Send + 'static>>,