[Feat] add new style type Inherit which allows components can inherit (#34)

style from parent component

Author: mistricky

core/src/components/code_block.rs

@@ -1,4 +1,7 @@
-use super::interface::component::Component;
+use super::interface::{
+    component::Component,
+    style::{RawComponentStyle, Size, Style},
+};
 
 pub struct CodeBlock {
     children: Vec<Box<dyn Component>>,
@@ -8,6 +11,10 @@ impl Component for CodeBlock {
     fn children(&self) -> &Vec<Box<dyn Component>> {
         &self.children
     }
+
+    fn style(&self) -> RawComponentStyle {
+        Style::default().size(Size::Inherit, Size::Dynamic)
+    }
 }
 
 impl CodeBlock {

core/src/components/container.rs

@@ -22,7 +22,7 @@ impl Container {
     }
 
     pub fn draw_root(&self, context: &ComponentContext) -> Result<Pixmap> {
-        let style = self.parsed_style();
+        let style = self.parsed_style(None);
         let mut pixmap = Pixmap::new(
             (style.width * context.scale_factor) as u32,
             (style.height * context.scale_factor) as u32,

core/src/components/highlight_code_block.rs

@@ -105,7 +105,7 @@ impl HighlightCodeBlock {
         let rect = Rect::from_xywh(
             render_params.x - self.editor_padding.left,
             render_params.y + start_y_offset,
-            parent_style.width + self.editor_padding.horizontal(),
+            parent_style.width,
             // If end_line_number is equal to start_line_number, the height should be line_height
             (end_line_number - start_line_number + 1) as f32 * self.line_height,
         )

core/src/components/interface/component.rs

@@ -86,14 +86,15 @@ pub trait Component {
         RawComponentStyle::default()
     }
 
-    fn parse_size(&self, size: Size, dynamic_value: f32) -> f32 {
+    fn parse_size(&self, size: Size, dynamic_value: f32, inherit_value: Option<f32>) -> f32 {
         match size {
             Size::Num(num) => num,
             Size::Dynamic => dynamic_value,
+            Size::Inherit => inherit_value.unwrap_or(dynamic_value),
         }
     }
 
-    fn parsed_style(&self) -> Style<f32> {
+    fn parsed_style(&self, parent_style: Option<&ComponentStyle>) -> Style<f32> {
         // If render_condition return false, the whole component shouldn't rendered,
         // includes its children
         if !self.render_condition() {
@@ -108,7 +109,7 @@ pub trait Component {
             RawComponentStyle::default()
         };
         let (width, height) = self.get_dynamic_wh();
-        let width = self.parse_size(style.width, width)
+        let width = self.parse_size(style.width, width, parent_style.map(|s| s.width))
             + style.padding.horizontal()
             + style.margin.horizontal();
 
@@ -119,7 +120,7 @@ pub trait Component {
             } else {
                 style.min_width
             },
-            height: self.parse_size(style.height, height)
+            height: self.parse_size(style.height, height, parent_style.map(|s| s.height))
                 + style.padding.vertical()
                 + style.margin.vertical(),
             align: style.align,
@@ -136,7 +137,7 @@ pub trait Component {
         parent_style: ComponentStyle,
         sibling_style: ComponentStyle,
     ) -> render_error::Result<RenderParams> {
-        let style = self.parsed_style();
+        let style = self.parsed_style(Some(&parent_style));
         let render_params = self.initialize(
             &component_render_params.parse_into_render_params_with_style(
                 parent_style.clone(),
@@ -172,7 +173,7 @@ pub trait Component {
                 style.clone(),
                 sibling_style,
             )?;
-            sibling_style = child.parsed_style();
+            sibling_style = child.parsed_style(Some(&style.clone()));
         }
 
         Ok(render_params.clone())
@@ -190,13 +191,13 @@ pub trait Component {
         match style.align {
             // If align is row, width is sum of children width, height is max of children height
             ComponentAlign::Row => calc_children_wh(|(w, h), child| {
-                let style = child.parsed_style();
+                let style = child.parsed_style(None);
 
                 (w + style.width, h.max(style.height))
             }),
             // If align is column, width is max of children width, height is sum of children height
             ComponentAlign::Column => calc_children_wh(|(w, h), child| {
-                let style = child.parsed_style();
+                let style = child.parsed_style(None);
 
                 (w.max(style.width), h + style.height)
             }),

core/src/components/interface/style.rs

@@ -8,6 +8,7 @@ pub enum ComponentAlign {
 
 pub enum Size {
     Dynamic,
+    Inherit,
     Num(f32),
 }
 

core/src/config.rs

@@ -132,7 +132,7 @@ pub struct Breadcrumbs {
     #[builder(setter(into, strip_option), default = None)]
     pub separator: Option<String>,
 
-    #[builder(setter(into, strip_option), default = None)]
+    #[builder(setter(into, strip_option), default = Some(String::from("CaskaydiaCove Nerd Font")))]
     pub font_family: Option<String>,
 
     #[builder(setter(into), default = String::from("#80848b"))]