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

Return impl IntoElement from Render::render trait

Browse source
This commit is contained in:
Nathan Sobo 2024-01-02 10:09:05 -07:00
parent 0f33775a91
commit 1b5c8b2b4a
84 changed files with 550 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/language_selector2/src/active_buffer_language.rs
View file

@ -1,7 +1,5 @@
use editor::Editor;
use gpui::{
div, Element, IntoElement, ParentElement, Render, Subscription, View, ViewContext, WeakView,
};
use gpui::{div, IntoElement, ParentElement, Render, Subscription, View, ViewContext, WeakView};
use std::sync::Arc;
use ui::{Button, ButtonCommon, Clickable, LabelSize, Tooltip};
use workspace::{item::ItemHandle, StatusItemView, Workspace};
@ -38,7 +36,7 @@ impl ActiveBufferLanguage {
}
impl Render for ActiveBufferLanguage {
fn render(&mut self, cx: &mut ViewContext<Self>) -> impl Element {
fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
div().when_some(self.active_language.as_ref(), |el, active_language| {
let active_language_text = if let Some(active_language_text) = active_language {
active_language_text.to_string()

2
crates/language_selector2/src/language_selector.rs
View file

@ -67,7 +67,7 @@ impl LanguageSelector {
}
impl Render for LanguageSelector {
fn render(&mut self, _cx: &mut ViewContext<Self>) -> impl Element {
fn render(&mut self, _cx: &mut ViewContext<Self>) -> impl IntoElement {
v_stack().w(rems(34.)).child(self.picker.clone())
}
}