clean: remove dead code

wechat-miniprogram · Dec 26, 2024 · 6ad2859 · 6ad2859
1 parent ff36dc3
commit 6ad2859
Show file tree

Hide file tree

Showing 6 changed files with 268 additions and 39 deletions.
diff --git a/float-pigment-css/float_pigment_css.h b/float-pigment-css/float_pigment_css.h
@@ -19,6 +19,8 @@ struct Angle;
 struct CalcExpr;
 
 
+static const uint16_t TEMP_SHEET_INDEX = UINT16_MAX;
+
 enum class AnimationDirectionItem {
   Normal,
   Reverse,
@@ -2643,6 +2645,97 @@ struct JustifyItemsType {
   };
 };
 
+struct GapType {
+  enum class Tag {
+    Invalid,
+    Initial,
+    Inherit,
+    Unset,
+    Var,
+    VarInShorthand,
+    Invalid0,
+    Invalid7,
+    Invalid8,
+    Invalid9,
+    InvalidA,
+    InvalidB,
+    InvalidC,
+    InvalidD,
+    InvalidE,
+    InvalidF,
+    Invalid10,
+    Invalid11,
+    Invalid12,
+    Invalid13,
+    Invalid14,
+    Invalid15,
+    Invalid16,
+    Invalid17,
+    Invalid18,
+    Invalid19,
+    Invalid1A,
+    Invalid1B,
+    Invalid1C,
+    Invalid1D,
+    Invalid1E,
+    Invalid1F,
+    Invalid20,
+    Invalid21,
+    Invalid22,
+    Invalid23,
+    Invalid24,
+    Invalid25,
+    Invalid26,
+    Invalid27,
+    Invalid28,
+    Invalid29,
+    Invalid2A,
+    Invalid2B,
+    Invalid2C,
+    Invalid2D,
+    Invalid2E,
+    Invalid2F,
+    Invalid30,
+    Invalid31,
+    Invalid32,
+    Invalid33,
+    Invalid34,
+    Invalid35,
+    Invalid36,
+    Invalid37,
+    Invalid38,
+    Invalid39,
+    Invalid3A,
+    Invalid3B,
+    Invalid3C,
+    Invalid3D,
+    Invalid3E,
+    Invalid3F,
+    Normal,
+    Length,
+  };
+
+  struct Var_Body {
+    Box<StrRef> _0;
+  };
+
+  struct VarInShorthand_Body {
+    Box<StrRef> _0;
+    Box<StrRef> _1;
+  };
+
+  struct Length_Body {
+    Length _0;
+  };
+
+  Tag tag;
+  union {
+    Var_Body var;
+    VarInShorthand_Body var_in_shorthand;
+    Length_Body length;
+  };
+};
+
 struct Color {
   enum class Tag {
     Undefined,
@@ -7717,8 +7810,8 @@ struct Property {
     FlexBasis,
     JustifyItems,
     Order,
-    Invalid2C,
-    Invalid2D,
+    RowGap,
+    ColumnGap,
     Invalid2E,
     Invalid2F,
     Invalid30,
@@ -8043,6 +8136,14 @@ struct Property {
     NumberType _0;
   };
 
+  struct RowGap_Body {
+    GapType _0;
+  };
+
+  struct ColumnGap_Body {
+    GapType _0;
+  };
+
   struct BackgroundColor_Body {
     ColorType _0;
   };
@@ -8490,6 +8591,8 @@ struct Property {
     FlexBasis_Body flex_basis;
     JustifyItems_Body justify_items;
     Order_Body order;
+    RowGap_Body row_gap;
+    ColumnGap_Body column_gap;
     BackgroundColor_Body background_color;
     BackgroundImage_Body background_image;
     BackgroundSize_Body background_size;
@@ -9042,6 +9145,6 @@ const char *substitute_variable(const char *expr_ptr,
                                 CustomPropertyGetter getter,
                                 CustomPropertySetter setter);
 
-} // extern "C"
+}  // extern "C"
 
-} // namespace float_pigment
+}  // namespace float_pigment
diff --git a/float-pigment-forest/float_pigment_layout.h b/float-pigment-forest/float_pigment_layout.h
@@ -51,7 +51,15 @@ using MeasureMaxContentWidth = float;
 
 using MeasureMaxContentHeight = float;
 
-using MeasureFunc = Size(*)(NodePtr, MeasureMaxWidth, MeasureMode, MeasureMaxHeight, MeasureMode, MeasureMinWidth, MeasureMinHeight, MeasureMaxContentWidth, MeasureMaxContentHeight);
+using MeasureFunc = Size(*)(NodePtr,
+                            MeasureMaxWidth,
+                            MeasureMode,
+                            MeasureMaxHeight,
+                            MeasureMode,
+                            MeasureMinWidth,
+                            MeasureMinHeight,
+                            MeasureMaxContentWidth,
+                            MeasureMaxContentHeight);
 
 using CalcHandle = int32_t;
 
@@ -238,6 +246,14 @@ void NodeStyleSetBottomPercentage(NodePtr node, float value);
 
 void NodeStyleSetBoxSizing(NodePtr node, BoxSizingType value);
 
+void NodeStyleSetColumnGap(NodePtr node, float value);
+
+void NodeStyleSetColumnGapCalcHandle(NodePtr node, int32_t calc_handle);
+
+void NodeStyleSetColumnGapNormal(NodePtr node);
+
+void NodeStyleSetColumnGapPercentage(NodePtr node, float value);
+
 void NodeStyleSetDisplay(NodePtr node, DisplayType value);
 
 void NodeStyleSetFlexBasis(NodePtr node, float value);
@@ -418,6 +434,14 @@ void NodeStyleSetRightNone(NodePtr node);
 
 void NodeStyleSetRightPercentage(NodePtr node, float value);
 
+void NodeStyleSetRowGap(NodePtr node, float value);
+
+void NodeStyleSetRowGapCalcHandle(NodePtr node, int32_t calc_handle);
+
+void NodeStyleSetRowGapNormal(NodePtr node);
+
+void NodeStyleSetRowGapPercentage(NodePtr node, float value);
+
 void NodeStyleSetTextAlign(NodePtr node, TextAlignType value);
 
 void NodeStyleSetTop(NodePtr node, float value);
@@ -444,6 +468,6 @@ void NodeStyleSetWritingMode(NodePtr node, WritingModeType value);
 
 const char *NodeToString(NodePtr node, bool recursive, bool layout, bool style);
 
-} // extern "C"
+}  // extern "C"
 
-} // namespace float_pigment
+}  // namespace float_pigment
diff --git a/float-pigment-layout/src/special_positioned.rs b/float-pigment-layout/src/special_positioned.rs
@@ -454,26 +454,3 @@ pub(crate) fn compute_special_position<T: LayoutTreeNode>(
 
     layout_unit.gen_origin(axis_info, **parent.inner_size, offset_main, offset_cross);
 }
-
-pub(crate) fn compute_position_relative<T: LayoutTreeNode>(
-    node: &T,
-    parent_inner_size: Normalized<Size<T::Length>>,
-) {
-    let mut layout_unit = node.layout_node().unit();
-    let style = node.style();
-    // apply relative offset
-    let left = style.left().resolve_num(parent_inner_size.width, node);
-    let right = style.right().resolve_num(parent_inner_size.width, node);
-    let top = style.top().resolve_num(parent_inner_size.height, node);
-    let bottom = style.bottom().resolve_num(parent_inner_size.height, node);
-    if let Some(left) = left.val() {
-        layout_unit.result.origin.x += left;
-    } else if let Some(right) = right.val() {
-        layout_unit.result.origin.x -= right;
-    }
-    if let Some(top) = top.val() {
-        layout_unit.result.origin.y += top;
-    } else if let Some(bottom) = bottom.val() {
-        layout_unit.result.origin.y -= bottom;
-    }
-}
diff --git a/float-pigment/float_pigment_css.h b/float-pigment/float_pigment_css.h
@@ -136,6 +136,6 @@ void *map,
 CustomPropertyGetter getter,
 CustomPropertySetter setter);
 
-} // extern "C"
+}  // extern "C"
 
-} // namespace float_pigment
+}  // namespace float_pigment
diff --git a/float-pigment/float_pigment_layout.h b/float-pigment/float_pigment_layout.h
@@ -51,7 +51,15 @@ using MeasureMaxContentWidth = float;
 
 using MeasureMaxContentHeight = float;
 
-using MeasureFunc = Size(*)(NodePtr, MeasureMaxWidth, MeasureMode, MeasureMaxHeight, MeasureMode, MeasureMinWidth, MeasureMinHeight, MeasureMaxContentWidth, MeasureMaxContentHeight);
+using MeasureFunc = Size(*)(NodePtr,
+                            MeasureMaxWidth,
+                            MeasureMode,
+                            MeasureMaxHeight,
+                            MeasureMode,
+                            MeasureMinWidth,
+                            MeasureMinHeight,
+                            MeasureMaxContentWidth,
+                            MeasureMaxContentHeight);
 
 using CalcHandle = int32_t;
 
@@ -238,6 +246,14 @@ void NodeStyleSetBottomPercentage(NodePtr node, float value);
 
 void NodeStyleSetBoxSizing(NodePtr node, BoxSizingType value);
 
+void NodeStyleSetColumnGap(NodePtr node, float value);
+
+void NodeStyleSetColumnGapCalcHandle(NodePtr node, int32_t calc_handle);
+
+void NodeStyleSetColumnGapNormal(NodePtr node);
+
+void NodeStyleSetColumnGapPercentage(NodePtr node, float value);
+
 void NodeStyleSetDisplay(NodePtr node, DisplayType value);
 
 void NodeStyleSetFlexBasis(NodePtr node, float value);
@@ -418,6 +434,14 @@ void NodeStyleSetRightNone(NodePtr node);
 
 void NodeStyleSetRightPercentage(NodePtr node, float value);
 
+void NodeStyleSetRowGap(NodePtr node, float value);
+
+void NodeStyleSetRowGapCalcHandle(NodePtr node, int32_t calc_handle);
+
+void NodeStyleSetRowGapNormal(NodePtr node);
+
+void NodeStyleSetRowGapPercentage(NodePtr node, float value);
+
 void NodeStyleSetTextAlign(NodePtr node, TextAlignType value);
 
 void NodeStyleSetTop(NodePtr node, float value);
@@ -444,6 +468,6 @@ void NodeStyleSetWritingMode(NodePtr node, WritingModeType value);
 
 const char *NodeToString(NodePtr node, bool recursive, bool layout, bool style);
 
-} // extern "C"
+}  // extern "C"
 
-} // namespace float_pigment
+}  // namespace float_pigment