Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WIP: Fix compilation of gpui2

Browse source
This commit is contained in:
Marshall Bowers 2023-10-26 09:51:33 +02:00
parent 965bfd8439
commit 8b972f6d8e
8 changed files with 19 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

5
crates/gpui2/src/element.rs
View file

@ -41,7 +41,7 @@ pub trait Element<V: 'static>: IntoAnyElement<V> {
#[derive(Deref, DerefMut, Default, Clone, Debug, Eq, PartialEq, Hash)]
pub struct GlobalElementId(SmallVec<[ElementId; 32]>);
pub trait ParentElement<V>: Element<V> {
pub trait ParentElement<V: 'static>: Element<V> {
fn children_mut(&mut self) -> &mut SmallVec<[AnyElement<V>; 2]>;
fn child(mut self, child: impl IntoAnyElement<V>) -> Self
@ -68,7 +68,7 @@ trait ElementObject<V> {
fn paint(&mut self, view_state: &mut V, cx: &mut ViewContext<V>);
}
struct RenderedElement<V, E: Element<V>> {
struct RenderedElement<V: 'static, E: Element<V>> {
element: E,
phase: ElementRenderPhase<E::ElementState>,
}
@ -181,6 +181,7 @@ pub struct AnyElement<V>(Box<dyn ElementObject<V> + Send + Sync>);
impl<V> AnyElement<V> {
pub fn new<E>(element: E) -> Self
where
V: 'static,
E: 'static + Send + Sync,
E: Element<V>,
E::ElementState: Any + Send + Sync,