Add round for text (#861)

NamseEnt · Jun 19, 2024 · 97654f4 · 97654f4
1 parent ce5b357
commit 97654f4
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/luda-editor/client/src/components/tool_tip.rs b/luda-editor/client/src/components/tool_tip.rs
@@ -35,6 +35,7 @@ impl Component for ToolTip {
                         right: 4.px(),
                         bottom: 4.px(),
                     }),
+                    ..Default::default()
                 }),
                 line_height_percent: 100.percent(),
                 underline: None,

diff --git a/namui/namui/src/namui/render/text.rs b/namui/namui/src/namui/render/text.rs
@@ -15,6 +15,7 @@ pub struct TextStyleDropShadow {
 pub struct TextStyleBackground {
     pub color: Color,
     pub margin: Option<Ltrb<Px>>,
+    pub round: Option<Px>,
 }
 #[derive(Clone, Debug)]
 pub struct TextStyle {
@@ -183,6 +184,7 @@ fn draw_background(param: &TextParam, font: &Font) -> RenderingTree {
             fill: Some(RectFill {
                 color: background.color,
             }),
+            round: background.round.map(|round| RectRound { radius: round }),
             ..Default::default()
         },
     })

diff --git a/namui/sample/register-font/src/lib.rs b/namui/sample/register-font/src/lib.rs
@@ -49,7 +49,7 @@ impl Component for FontExample {
                 color: Color::WHITE,
                 background: Some(TextStyleBackground {
                     color: Color::BLACK,
-                    margin: None,
+                    ..Default::default()
                 }),
                 line_height_percent: 100.percent(),
                 underline: None,

diff --git a/quick/src/block/row_block.rs b/quick/src/block/row_block.rs
@@ -47,7 +47,7 @@ impl<'a> RowBlock<'a> {
                     color: Color::grayscale_f01(0.8),
                     background: Some(TextStyleBackground {
                         color: crate::color::BACKGROUND,
-                        margin: None,
+                        ..Default::default()
                     }),
                     ..Default::default()
                 },

diff --git a/quick/src/link.rs b/quick/src/link.rs
@@ -16,7 +16,7 @@ impl Link {
                 color: Color::grayscale_f01(1.8),
                 background: Some(TextStyleBackground {
                     color: crate::color::BACKGROUND,
-                    margin: None,
+                    ..Default::default()
                 }),
                 underline: Some(
                     PaintBuilder::new()