zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-08 15:44:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use Flexible in file finder and theme switcher instead of Expanded

Browse Source
This commit is contained in:
Antonio Scandurra 2021-09-03 13:01:12 +02:00
parent 776f7dd5a9
commit 4c7eaaebb1
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gpui/src/elements/uniform_list.rs
View File

@ -150,6 +150,8 @@ where
for item in &mut items {
item.layout(item_constraint, cx);
}
} else {
size = constraint.min;
}
(

4
gpui/src/scene.rs
View File

@ -210,7 +210,9 @@ impl StackingContext {
clip_bounds
.intersection(parent_clip_bounds.unwrap_or(clip_bounds))
.unwrap_or_else(|| {
log::warn!("specified clip bounds are disjoint from parent layer");
if !clip_bounds.is_empty() {
log::warn!("specified clip bounds are disjoint from parent layer");
}
RectF::default()
})
})

4
zed/src/file_finder.rs
View File

@ -87,7 +87,7 @@ impl View for FileFinder {
Container::new(
Flex::new(Axis::Vertical)
.with_child(ChildView::new(self.query_editor.id()).boxed())
.with_child(Expanded::new(1.0, self.render_matches()).boxed())
.with_child(Flexible::new(1.0, self.render_matches()).boxed())
.boxed(),
)
.with_style(&settings.theme.selector.container)
@ -173,7 +173,7 @@ impl FileFinder {
.boxed(),
)
.with_child(
Expanded::new(
Flexible::new(
1.0,
Flex::column()
.with_child(

7
zed/src/theme_selector.rs
View File

@ -9,10 +9,7 @@ use crate::{
};
use gpui::{
action,
elements::{
Align, ChildView, ConstrainedBox, Container, Expanded, Flex, Label, ParentElement,
UniformList, UniformListState,
},
elements::*,
keymap::{self, menu, Binding},
AppContext, Axis, Element, ElementBox, Entity, MutableAppContext, RenderContext, View,
ViewContext, ViewHandle,
@ -283,7 +280,7 @@ impl View for ThemeSelector {
Container::new(
Flex::new(Axis::Vertical)
.with_child(ChildView::new(self.query_editor.id()).boxed())
.with_child(Expanded::new(1.0, self.render_matches(cx)).boxed())
.with_child(Flexible::new(1.0, self.render_matches(cx)).boxed())
.boxed(),
)
.with_style(&settings.theme.selector.container)