mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-26 10:40:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

formatting fixes

Browse source
This commit is contained in:
Keith Simmons 2022-03-09 10:42:27 -08:00
parent 853acccbc2
commit 5aad1ff788
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
crates/file_finder/src/file_finder.rs
View file

@ -76,7 +76,8 @@ impl View for FileFinder {
Container::new(
Flex::new(Axis::Vertical)
.with_child(
ChildView::new(&self.query_editor).contained()
ChildView::new(&self.query_editor)
.contained()
.with_style(settings.theme.selector.input_editor.container)
.boxed(),
)

6
crates/theme_selector/src/theme_selector.rs
View file

@ -218,7 +218,8 @@ impl ThemeSelector {
))
};
self.selected_index = self.selected_index
self.selected_index = self
.selected_index
.min(self.matches.len().saturating_sub(1));
cx.notify();
@ -341,7 +342,8 @@ impl View for ThemeSelector {
Container::new(
Flex::new(Axis::Vertical)
.with_child(
ChildView::new(&self.query_editor).contained()
ChildView::new(&self.query_editor)
.contained()
.with_style(settings.theme.selector.input_editor.container)
.boxed(),
)

9
crates/workspace/src/workspace.rs
View file

@ -755,7 +755,11 @@ impl Workspace {
}
// Returns the model that was toggled closed if it was open
pub fn toggle_modal<V, F>(&mut self, cx: &mut ViewContext<Self>, add_view: F) -> Option<ViewHandle<V>>
pub fn toggle_modal<V, F>(
&mut self,
cx: &mut ViewContext<Self>,
add_view: F,
) -> Option<ViewHandle<V>>
where
V: 'static + View,
F: FnOnce(&mut ViewContext<Self>, &mut Self) -> ViewHandle<V>,
@ -763,8 +767,7 @@ impl Workspace {
cx.notify();
// Whatever modal was visible is getting clobbered. If its the same type as V, then return
// it. Otherwise, create a new modal and set it as active.
let already_open_modal = self.modal.take()
.and_then(|modal| modal.downcast::<V>());
let already_open_modal = self.modal.take().and_then(|modal| modal.downcast::<V>());
if let Some(already_open_modal) = already_open_modal {
cx.focus_self();
Some(already_open_modal)