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

Merge branch 'gpui2' into gpui2-theme-to-color

Browse source
This commit is contained in:
Marshall Bowers 2023-10-19 16:10:44 -04:00
commit 3932c1064e
38 changed files with 2036 additions and 340 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,6 @@
pub use gpui3::{
div, Click, Element, Hover, IntoAnyElement, ParentElement, ScrollState, SharedString, Styled,
ViewContext, WindowContext,
div, Active, Click, Element, Hover, IntoAnyElement, ParentElement, ScrollState, SharedString,
Styled, ViewContext, WindowContext,
};
use crate::settings::user_settings;
@ -278,12 +278,12 @@ impl HighlightColor {
}
}
pub fn ui_size(size: f32) -> Rems {
pub fn ui_size(cx: &mut WindowContext, size: f32) -> Rems {
const UI_SCALE_RATIO: f32 = 0.875;
let setting = user_settings();
let settings = user_settings(cx);
rems(*setting.ui_scale * UI_SCALE_RATIO * size)
rems(*settings.ui_scale * UI_SCALE_RATIO * size)
}
#[derive(Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, EnumIter)]