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

Clean compile with redesigned element traits

Browse source
This commit is contained in:
Nathan Sobo 2023-11-18 21:51:47 -07:00
parent 0673606de8
commit 33cd6f520a
35 changed files with 278 additions and 216 deletions
Download patch file Download diff file Expand all files Collapse all files

32
crates/gpui2/src/elements/text.rs
View file

@ -11,10 +11,6 @@ use util::ResultExt;
impl<V: 'static> Element<V> for &'static str {
type State = TextState;
fn element_id(&self) -> Option<ElementId> {
None
}
fn layout(
&mut self,
_: &mut V,
@ -40,6 +36,10 @@ impl<V: 'static> Element<V> for &'static str {
impl<V: 'static> RenderOnce<V> for &'static str {
type Element = Self;
fn element_id(&self) -> Option<ElementId> {
None
}
fn render_once(self) -> Self::Element {
self
}
@ -48,10 +48,6 @@ impl<V: 'static> RenderOnce<V> for &'static str {
impl<V: 'static> Element<V> for SharedString {
type State = TextState;
fn element_id(&self) -> Option<ElementId> {
Some(self.clone().into())
}
fn layout(
&mut self,
_: &mut V,
@ -78,6 +74,10 @@ impl<V: 'static> Element<V> for SharedString {
impl<V: 'static> RenderOnce<V> for SharedString {
type Element = Self;
fn element_id(&self) -> Option<ElementId> {
Some(self.clone().into())
}
fn render_once(self) -> Self::Element {
self
}
@ -105,10 +105,6 @@ impl StyledText {
impl<V: 'static> Element<V> for StyledText {
type State = TextState;
fn element_id(&self) -> Option<crate::ElementId> {
None
}
fn layout(
&mut self,
_view: &mut V,
@ -194,6 +190,10 @@ impl<V: 'static> Element<V> for StyledText {
impl<V: 'static> RenderOnce<V> for StyledText {
type Element = Self;
fn element_id(&self) -> Option<crate::ElementId> {
None
}
fn render_once(self) -> Self::Element {
self
}
@ -300,10 +300,6 @@ struct InteractiveTextState {
impl<V: 'static> Element<V> for InteractiveText {
type State = InteractiveTextState;
fn element_id(&self) -> Option<ElementId> {
Some(self.id.clone())
}
fn layout(
&mut self,
view_state: &mut V,
@ -346,6 +342,10 @@ impl<V: 'static> Element<V> for InteractiveText {
impl<V: 'static> RenderOnce<V> for InteractiveText {
type Element = Self;
fn element_id(&self) -> Option<ElementId> {
Some(self.id.clone())
}
fn render_once(self) -> Self::Element {
self
}