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

Refine naming of element-related types and traits

Browse source 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
This commit is contained in:
Nathan Sobo 2023-04-21 13:04:03 -06:00
parent 03619dfa55
commit fe492eacbf
93 changed files with 661 additions and 656 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/workspace/src/status_bar.rs
View file

@ -8,8 +8,8 @@ use gpui::{
vector::{vec2f, Vector2F},
},
json::{json, ToJson},
AnyViewHandle, Element, Entity, SceneBuilder, SizeConstraint, Subscription, View, ViewContext,
ViewHandle, WindowContext,
AnyElement, AnyViewHandle, Entity, SceneBuilder, SizeConstraint, Subscription, View,
ViewContext, ViewHandle, WindowContext,
};
use settings::Settings;
@ -46,7 +46,7 @@ impl View for StatusBar {
"StatusBar"
}
fn render(&mut self, cx: &mut ViewContext<Self>) -> Element<Self> {
fn render(&mut self, cx: &mut ViewContext<Self>) -> AnyElement<Self> {
let theme = &cx.global::<Settings>().theme.workspace.status_bar;
StatusBarElement {
@ -57,7 +57,7 @@ impl View for StatusBar {
.contained()
.with_margin_right(theme.item_spacing)
}))
.into_element(),
.into_any(),
right: Flex::row()
.with_children(self.right_items.iter().rev().map(|i| {
@ -66,13 +66,13 @@ impl View for StatusBar {
.contained()
.with_margin_left(theme.item_spacing)
}))
.into_element(),
.into_any(),
}
.contained()
.with_style(theme.container)
.constrained()
.with_height(theme.height)
.into_element()
.into_any()
}
}
@ -145,11 +145,11 @@ impl From<&dyn StatusItemViewHandle> for AnyViewHandle {
}
struct StatusBarElement {
left: Element<StatusBar>,
right: Element<StatusBar>,
left: AnyElement<StatusBar>,
right: AnyElement<StatusBar>,
}
impl Drawable<StatusBar> for StatusBarElement {
impl Element<StatusBar> for StatusBarElement {
type LayoutState = ();
type PaintState = ();