Merge branch 'gpui2' into gpui2-theme-to-color
This commit is contained in:
commit
3932c1064e
38 changed files with 2036 additions and 340 deletions
|
@ -98,7 +98,7 @@ impl<S: 'static + Send + Sync + Clone> Label<S> {
|
|||
.bg(LabelColor::Hidden.hsla(cx)),
|
||||
)
|
||||
})
|
||||
.text_size(ui_size(1.))
|
||||
.text_size(ui_size(cx, 1.))
|
||||
.when(self.line_height_style == LineHeightStyle::UILabel, |this| {
|
||||
this.line_height(relative(1.))
|
||||
})
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue