update 1019

Author: syf20020816

src/SUMMARY.md

@@ -13,6 +13,7 @@
     - [GenUI Ignore](./gen/tutorials/ignore.md)
     - [Props Manual](./gen/tutorials/props/introduction.md)
       - [Type](./gen/tutorials/props/type.md)
+      - [Named](./gen/tutorials/props/named.md)
       - [Font](./gen/tutorials/props/font.md)
       - [Text](./gen/tutorials/props/text.md)
       - [Background](./gen/tutorials/props/background.md)

src/gen/makepad/components/label.md

@@ -17,23 +17,28 @@ live_design! {
         height: 100.0,
         width: Fill,
         spacing: 10.0,
+        flow: Down,
         <Label>{
             text: "GLabel"
         }
-        <GLabel>{
-            text: "Hello, world! This is a long message, but I use wrap Word to wrap it!",
-            height: 48.0,
-            width: 120.0,
-            wrap: Word,
-            brightness: 1.5,
-            margin: {left: 12.0},
-        }
-        <GLabel>{
-            text: "bold, test bold!!",
-            font_size: 12.0,
-            padding: 16.0,
-            color: #FF0000,
-            font_family: dep("E:/Rust/try/makepad/Gen-UI/examples/gen_widget_example/resources/GoNotoKurrent-Bold.ttf"),
+        <GHLayout>{
+            height: Fit,
+            width: Fill,
+            spacing: 10.0,
+            <GLabel>{
+                text: "Hello, world! This is a long message, but I use wrap Word to wrap it!",
+                height: Fit,
+                width: 120.0,
+                wrap: Word,
+                margin: {left: 12.0},
+            }
+            <GLabel>{
+                text: "test another font family!!",
+                font_size: 12.0,
+                padding: 16.0,
+                color: #FF0000,
+                font_family: dep("crate://self/resources/AlimamaFangYuanTiVF-Thin.ttf"),
+            }
         }
     }
 }
@@ -45,19 +50,22 @@ live_design! {
 |--|--|--|--|
 |live|color|`Vec4`|The color of the label.|
 |live|font_size|`f64`|The size of the font used in the label.|
-|live|brightness|`f32`|The brightness level of the text.|
-|live|curve|`f32`|The curve factor of the text.|
+|live|brightness(unused)|`f32`|The brightness level of the text.|
+|live|curve(unused)|`f32`|The curve factor of the text.|
 |live|line_spacing|`f64`|The line spacing of the text.|
 |live|top_drop|`f64`|The top drop of the text.|
 |live|height_factor|`f64`|The height factor of the text.|
 |live|wrap|`TextWrap`|The text wrapping mode.|
 |live|font_family|`LiveDependency`|The font family of the text.|
 |live|visible|`bool`|Whether the label is visible.|
 |deref|draw_text|`DrawText`|The `DrawText` component used for drawing the text.|
-|walk|walk|`Walk`|The `Walk` component for positioning.|
+|walk|height|`Size`|The height of the label|
+|walk|width|`Size`|The width of the label|
+|walk|abs_pos|`Option<DVec2>`|abs position of the component|
+|walk|margin|`Margin`|the margin around the component|
 |live|align|`Align`|The alignment of the text.|
-|live|padding|`Padding`|The padding around the text.|
-|live|text|`RcStringMut`|The content of the label.|
+|live|padding|`Padding`|The padding around the text. default `0.0`|
+|live|text|`ArcStringMut`|The content of the label.|
 
 ## Event
 

src/gen/tutorials/props/named.md

@@ -0,0 +1,41 @@
+# Named
+
+> 说明:
+> 
+> 命名规则是属性命名的基础, 用于对属性命名进行规范化处理, 规则如下:
+> 1. 若无特殊情况属性命名必须依照基础命名原则
+> 2. 当出现基础命名不足够时采用基础组件命名法
+
+## 基础组件命名法
+
+基础组件命名法只有在出现基础命名不足够时进行使用, 它的原则很简单
+
+即: `${base_ele}_${base_prop_name}`
+
+例如:
+
+当某个组件中已经有代表hover状态时的`hover_color`时，还需要对线条处于hover状态时定义颜色属性
+
+那么这个新属性为: `stroke_hover_color`
+
+## base ele
+
+base ele指的是最基本的构成部分，他是所有其他组件的基础
+
+- stroke: 线条
+- text: 文本
+- 
+
+## Color
+
+### 基础命名说明 
+
+|命名|说明|
+|--|--|
+|background_color|背景色, 在任意具有区域化的组件中都应该含有|
+|color|文字颜色, 仅在带有文字的组件中含有|
+|stroke_color|线条颜色, 在含有线条的组件中使用, 例如图标|
+|hover_color|当hover时的颜色|
+|pressed_color|当pressed时的颜色|
+|border_color|边框颜色|
+|shadow_color|阴影颜色|