From fffe4f51fbd48cdff1b540a3e0fef6753994783f Mon Sep 17 00:00:00 2001 From: Nate Butler Date: Wed, 6 Dec 2023 23:38:47 -0500 Subject: [PATCH] Update pickers to have a consistently larger size --- crates/collab_ui2/src/collab_panel/channel_modal.rs | 4 ++-- crates/collab_ui2/src/collab_panel/contact_finder.rs | 4 ++-- crates/command_palette2/src/command_palette.rs | 2 +- crates/language_selector2/src/language_selector.rs | 4 ++-- crates/outline2/src/outline.rs | 2 +- crates/recent_projects2/src/recent_projects.rs | 2 +- crates/theme_selector2/src/theme_selector.rs | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/crates/collab_ui2/src/collab_panel/channel_modal.rs b/crates/collab_ui2/src/collab_panel/channel_modal.rs index fc1a4c5fb7f8f9e3b7c2a63a885207306a7c1ed3..af6343b98af37920f388eb042f27cbc281e6f4aa 100644 --- a/crates/collab_ui2/src/collab_panel/channel_modal.rs +++ b/crates/collab_ui2/src/collab_panel/channel_modal.rs @@ -11,7 +11,7 @@ use gpui::{ }; use picker::{Picker, PickerDelegate}; use std::sync::Arc; -use ui::v_stack; +use ui::prelude::*; use util::TryFutureExt; actions!( @@ -151,7 +151,7 @@ impl Render for ChannelModal { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { - v_stack().min_w_96().child(self.picker.clone()) + v_stack().w(rems(34.)).child(self.picker.clone()) // let theme = &theme::current(cx).collab_panel.tabbed_modal; // let mode = self.picker.read(cx).delegate().mode; diff --git a/crates/collab_ui2/src/collab_panel/contact_finder.rs b/crates/collab_ui2/src/collab_panel/contact_finder.rs index 717ab2d8970bdba55d88dd51dc207b03bc146f3c..1623d10eab23a4473e1e89ea79c2f4fbcf86f1e4 100644 --- a/crates/collab_ui2/src/collab_panel/contact_finder.rs +++ b/crates/collab_ui2/src/collab_panel/contact_finder.rs @@ -7,7 +7,7 @@ use gpui::{ use picker::{Picker, PickerDelegate}; use std::sync::Arc; use theme::ActiveTheme as _; -use ui::{h_stack, v_stack, Label}; +use ui::prelude::*; use util::{ResultExt as _, TryFutureExt}; pub fn init(cx: &mut AppContext) { @@ -58,7 +58,7 @@ impl Render for ContactFinder { .bg(cx.theme().colors().element_background), ) .child(self.picker.clone()) - .w_96() + .w(rems(34.)) } // fn focus_in(&mut self, _: gpui::AnyViewHandle, cx: &mut ViewContext) { diff --git a/crates/command_palette2/src/command_palette.rs b/crates/command_palette2/src/command_palette.rs index bdd66fa569cb38b983abf2a4ac8418b80b734ff4..57c1fa5614016ba99331c1f0fe6f1945f4d243a2 100644 --- a/crates/command_palette2/src/command_palette.rs +++ b/crates/command_palette2/src/command_palette.rs @@ -84,7 +84,7 @@ impl Render for CommandPalette { type Element = Div; fn render(&mut self, _cx: &mut ViewContext) -> Self::Element { - v_stack().min_w_96().child(self.picker.clone()) + v_stack().w(rems(34.)).child(self.picker.clone()) } } diff --git a/crates/language_selector2/src/language_selector.rs b/crates/language_selector2/src/language_selector.rs index e3970401d4c9201d631e0548ca306f6ca63e7a94..5d6914d1e2822f235377be05ce9e36e45c674b85 100644 --- a/crates/language_selector2/src/language_selector.rs +++ b/crates/language_selector2/src/language_selector.rs @@ -12,7 +12,7 @@ use language::{Buffer, LanguageRegistry}; use picker::{Picker, PickerDelegate}; use project::Project; use std::sync::Arc; -use ui::{v_stack, HighlightedLabel, ListItem, Selectable}; +use ui::{prelude::*, HighlightedLabel, ListItem}; use util::ResultExt; use workspace::Workspace; @@ -70,7 +70,7 @@ impl Render for LanguageSelector { type Element = Div; fn render(&mut self, _cx: &mut ViewContext) -> Self::Element { - v_stack().min_w_96().child(self.picker.clone()) + v_stack().w(rems(34.)).child(self.picker.clone()) } } diff --git a/crates/outline2/src/outline.rs b/crates/outline2/src/outline.rs index 8442d6480d4d011cbb745fa8de815118538dbf96..8674416899f9e090bc498ac78de08b109ab017ff 100644 --- a/crates/outline2/src/outline.rs +++ b/crates/outline2/src/outline.rs @@ -60,7 +60,7 @@ impl Render for OutlineView { type Element = Div; fn render(&mut self, _cx: &mut ViewContext) -> Self::Element { - v_stack().min_w_96().child(self.picker.clone()) + v_stack().w(rems(34.)).child(self.picker.clone()) } } diff --git a/crates/recent_projects2/src/recent_projects.rs b/crates/recent_projects2/src/recent_projects.rs index f6c2e0a2a2889daac6871ba2512bc297b203d93e..0c11f2b9c7d9d579aa5de810078236bccec432f4 100644 --- a/crates/recent_projects2/src/recent_projects.rs +++ b/crates/recent_projects2/src/recent_projects.rs @@ -97,7 +97,7 @@ impl Render for RecentProjects { type Element = Div; fn render(&mut self, _cx: &mut ViewContext) -> Self::Element { - v_stack().w_96().child(self.picker.clone()) + v_stack().w(rems(34.)).child(self.picker.clone()) } } diff --git a/crates/theme_selector2/src/theme_selector.rs b/crates/theme_selector2/src/theme_selector.rs index 582ce43a88ddc8c197617693adbf0e05ab7b11e3..cbde6bc7a640ed07627437c618f2ab8115b61411 100644 --- a/crates/theme_selector2/src/theme_selector.rs +++ b/crates/theme_selector2/src/theme_selector.rs @@ -68,7 +68,7 @@ impl Render for ThemeSelector { type Element = Div; fn render(&mut self, _cx: &mut ViewContext) -> Self::Element { - v_stack().min_w_96().child(self.picker.clone()) + v_stack().w(rems(34.)).child(self.picker.clone()) } }