button: Fix Button text vertical center.

huacnlee · Sep 27, 2024 · a2af83e · a2af83e
1 parent 26d9583
commit a2af83e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/crates/app/src/story_workspace.rs b/crates/app/src/story_workspace.rs
@@ -284,6 +284,7 @@ impl Render for StoryWorkspace {
         let notifications_count = cx.notifications().len();
 
         div()
+            .font_family(".SystemUIFont")
             .relative()
             .size_full()
             .flex()

diff --git a/crates/ui/src/button.rs b/crates/ui/src/button.rs
@@ -314,13 +314,6 @@ impl RenderOnce for Button {
             _ => self.size,
         };
 
-        // Hotfix the font vertical center for macOS.
-        let text_offset_top = if cfg!(target_os = "windows") {
-            px(0.)
-        } else {
-            px(2.)
-        };
-
         self.base
             .id(self.id)
             .flex()
@@ -443,13 +436,7 @@ impl RenderOnce for Button {
                         )
                     })
                     .when_some(self.label, |this, label| {
-                        this.child(
-                            div()
-                                .flex_none()
-                                // .mt(text_offset_top)
-                                .line_height(relative(1.))
-                                .child(label),
-                        )
+                        this.child(div().flex_none().line_height(relative(1.)).child(label))
                     })
                     .children(self.children)
             })