Merge branch 'main' into update-pickers
This commit is contained in:
commit
9e6103f863
95 changed files with 10906 additions and 3606 deletions
|
@ -70,8 +70,7 @@ pub trait StyledExt: Styled + Sized {
|
|||
/// or other places that text needs to match the user's buffer font size.
|
||||
fn text_buffer(self, cx: &mut WindowContext) -> Self {
|
||||
let settings = ThemeSettings::get_global(cx);
|
||||
|
||||
self.text_size(settings.buffer_font_size)
|
||||
self.text_size(settings.buffer_font_size(cx))
|
||||
}
|
||||
|
||||
/// The [`Surface`](ui2::ElevationIndex::Surface) elevation level, located above the app background, is the standard level for all elements
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue