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

Update StyledExt to use more idiomatic method naming

Browse source
This commit is contained in:
Nate Butler 2023-11-08 14:42:56 -05:00
parent 6ecf629c63
commit 4ef2f0b2b9
2 changed files with 36 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

28
crates/ui2/src/prelude.rs
View file

@ -14,8 +14,18 @@ use strum::EnumIter;
#[derive(Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, EnumIter)] #[derive(Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, EnumIter)]
pub enum UITextSize { pub enum UITextSize {
/// The default size for UI text.
///
/// `0.825rem` or `14px` at the default scale of `1rem` = `16px`.
///
/// Note: The absolute size of this text will change based on a user's `ui_scale` setting.
#[default] #[default]
Default, Default,
/// The small size for UI text.
///
/// `0.75rem` or `12px` at the default scale of `1rem` = `16px`.
///
/// Note: The absolute size of this text will change based on a user's `ui_scale` setting.
Small, Small,
} }
@ -28,24 +38,6 @@ impl UITextSize {
} }
} }
/// The default text size for UI text
///
/// At a default 16px per rem, this is 14px.
///
/// Use [`ui_text_sm`] for smaller text.
pub fn ui_text_default() -> Rems {
rems(0.875)
}
/// The small text size for UI text
///
/// At a default 16px per rem, this is 12px.
///
/// Use [`ui_text_default`] for regular-sized text.
pub fn ui_text_sm() -> Rems {
rems(0.75)
}
#[derive(Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, EnumIter)] #[derive(Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, EnumIter)]
pub enum FileSystemStatus { pub enum FileSystemStatus {
#[default] #[default]

40
crates/ui2/src/styled_ext.rs
View file

@ -1,28 +1,40 @@
use gpui::Styled; use gpui::{Div, Styled};
use crate::UITextSize; use crate::UITextSize;
pub trait StyledExt: Styled { /// Extends [`Styled`](gpui::Styled) with Zed specific styling methods.
fn text_ui_size(self, size: UITextSize) -> Self pub trait StyledExt {
where fn text_ui_size(self, size: UITextSize) -> Self;
Self: Sized, fn text_ui(self) -> Self;
{ fn text_ui_sm(self) -> Self;
}
impl<V: 'static> StyledExt for Div<V> {
fn text_ui_size(self, size: UITextSize) -> Self {
let size = size.rems(); let size = size.rems();
self.text_size(size) self.text_size(size)
} }
fn text_ui(self) -> Self /// The default size for UI text.
where ///
Self: Sized, /// `0.825rem` or `14px` at the default scale of `1rem` = `16px`.
{ ///
/// Note: The absolute size of this text will change based on a user's `ui_scale` setting.
///
/// Use [`text_ui_sm`] for regular-sized text.
fn text_ui(self) -> Self {
let size = UITextSize::default().rems(); let size = UITextSize::default().rems();
self.text_size(size) self.text_size(size)
} }
fn text_ui_sm(self) -> Self /// The small size for UI text.
where ///
Self: Sized, /// `0.75rem` or `12px` at the default scale of `1rem` = `16px`.
{ ///
/// Note: The absolute size of this text will change based on a user's `ui_scale` setting.
///
/// Use [`text_ui`] for regular-sized text.
fn text_ui_sm(self) -> Self {
let size = UITextSize::Small.rems(); let size = UITextSize::Small.rems();
self.text_size(size) self.text_size(size)