convert GUIStyleName from enum to class

zwcloud · Oct 31, 2019 · cf38505 · cf38505
1 parent 2b7fc2e
commit cf38505
Show file tree

Hide file tree

Showing 3 changed files with 88 additions and 90 deletions.
diff --git a/src/ImGui/Control/Button.cs b/src/ImGui/Control/Button.cs
@@ -104,7 +104,7 @@ public static bool Button(string text, LayoutOptions? options)
         }
 
         public static bool Button(string text) => Button(text, null);
-
+#if false
         public static bool ImageButton(string filePath, Size size, Point uv0, Point uv1)
         {
             var window = GetCurrentWindow();
@@ -126,7 +126,6 @@ public static bool ImageButton(string filePath, Size size, Point uv0, Point uv1)
                 node.AttachLayoutEntry(size);
                 container.AppendChild(node);
             }
-            node.RuleSet.BorderImageSlice = ()
             node.ActiveSelf = true;
 
             // rect
@@ -150,6 +149,7 @@ public static bool ImageButton(string filePath)
         {
             return ImageButton(filePath, Size.Empty, Point.Zero, Point.One);
         }
+#endif
     }
 
     internal partial class GUIBehavior

diff --git a/src/ImGui/Style/GUIStyleName.cs b/src/ImGui/Style/GUIStyleName.cs
@@ -1,94 +1,94 @@
 namespace ImGui
 {
-    public enum GUIStyleName//FIXME rename to StyleProperty(Name)
+    public class GUIStyleName//FIXME rename to StyleProperty(Name)
     {
         #region Box model
-        MinWidth,
-        MaxWidth,
-        MinHeight,
-        MaxHeight,
-
-        PaddingTop,
-        PaddingRight,
-        PaddingBottom,
-        PaddingLeft,
-
-        BorderTop,
-        BorderRight,
-        BorderBottom,
-        BorderLeft,
-        BorderTopColor,
-        BorderRightColor,
-        BorderBottomColor,
-        BorderLeftColor,
-
-        BorderImageSource,
-        BorderImageSliceTop,
-        BorderImageSliceRight,
-        BorderImageSliceBottom,
-        BorderImageSliceLeft,
-
-        BorderTopLeftRadius,
-        BorderTopRightRadius,
-        BorderBottomRightRadius,
-        BorderBottomLeftRadius,
-
-
-        OutlineWidth,
-        OutlineColor,
+        public static GUIStyleName MinWidth = new GUIStyleName();
+        public static GUIStyleName MaxWidth = new GUIStyleName();
+        public static GUIStyleName MinHeight = new GUIStyleName();
+        public static GUIStyleName MaxHeight = new GUIStyleName();
+
+        public static GUIStyleName PaddingTop = new GUIStyleName();
+        public static GUIStyleName PaddingRight = new GUIStyleName();
+        public static GUIStyleName PaddingBottom = new GUIStyleName();
+        public static GUIStyleName PaddingLeft = new GUIStyleName();
+
+        public static GUIStyleName BorderTop = new GUIStyleName();
+        public static GUIStyleName BorderRight = new GUIStyleName();
+        public static GUIStyleName BorderBottom = new GUIStyleName();
+        public static GUIStyleName BorderLeft = new GUIStyleName();
+        public static GUIStyleName BorderTopColor = new GUIStyleName();
+        public static GUIStyleName BorderRightColor = new GUIStyleName();
+        public static GUIStyleName BorderBottomColor = new GUIStyleName();
+        public static GUIStyleName BorderLeftColor = new GUIStyleName();
+
+        public static GUIStyleName BorderImageSource = new GUIStyleName();
+        public static GUIStyleName BorderImageSliceTop = new GUIStyleName();
+        public static GUIStyleName BorderImageSliceRight = new GUIStyleName();
+        public static GUIStyleName BorderImageSliceBottom = new GUIStyleName();
+        public static GUIStyleName BorderImageSliceLeft = new GUIStyleName();
+
+        public static GUIStyleName BorderTopLeftRadius = new GUIStyleName();
+        public static GUIStyleName BorderTopRightRadius = new GUIStyleName();
+        public static GUIStyleName BorderBottomRightRadius = new GUIStyleName();
+        public static GUIStyleName BorderBottomLeftRadius = new GUIStyleName();
+
+
+        public static GUIStyleName OutlineWidth = new GUIStyleName();
+        public static GUIStyleName OutlineColor = new GUIStyleName();
         #endregion Box model
 
-        HorizontalStretchFactor,
-        VerticalStretchFactor,
-
-        CellSpacingHorizontal,
-        CellSpacingVertical,
-
-        BackgroundColor,
-        BackgroundImage,
-        BackgroundGradient,
-
-        TextAlignment,
-        AlignmentHorizontal,
-        AlignmentVertical,
-
-        FontFamily,
-        FontStyle,
-        FontStretch,
-        FontWeight,
-        FontSize,
-        FontColor,
-
-        Slider_LineUsed,
-        Slider_LineUnused,
-
-        StrokeColor,
-        StrokeWidth,
-        FillColor,
-
-        GradientLeftColor,
-        GradientTopColor,
-        GradientRightColor,
-        GradientBottomColor,
-
-        MinTextureCoordinateU,
-        MaxTextureCoordinateU,
-        MinTextureCoordinateV,
-        MaxTextureCoordinateV,
-
-        _FieldWidth,
-        _ControlLabelSpacing,
-        _LabelWidth,
-        _LabelHeight,
-
-        WindowRounding,
-        ResizeGripColor,
-        WindowBorderColor,
-        WindowShadowColor,
-        WindowShadowWidth,
-
-        ScrollBarWidth,
-        ScrollBarBackgroundColor,
-        ScrollBarButtonColor,
+        public static GUIStyleName HorizontalStretchFactor = new GUIStyleName();
+        public static GUIStyleName VerticalStretchFactor = new GUIStyleName();
+
+        public static GUIStyleName CellSpacingHorizontal = new GUIStyleName();
+        public static GUIStyleName CellSpacingVertical = new GUIStyleName();
+
+        public static GUIStyleName BackgroundColor = new GUIStyleName();
+        public static GUIStyleName BackgroundImage = new GUIStyleName();
+        public static GUIStyleName BackgroundGradient = new GUIStyleName();
+
+        public static GUIStyleName TextAlignment = new GUIStyleName();
+        public static GUIStyleName AlignmentHorizontal = new GUIStyleName();
+        public static GUIStyleName AlignmentVertical = new GUIStyleName();
+
+        public static GUIStyleName FontFamily = new GUIStyleName();
+        public static GUIStyleName FontStyle = new GUIStyleName();
+        public static GUIStyleName FontStretch = new GUIStyleName();
+        public static GUIStyleName FontWeight = new GUIStyleName();
+        public static GUIStyleName FontSize = new GUIStyleName();
+        public static GUIStyleName FontColor = new GUIStyleName();
+
+        public static GUIStyleName Slider_LineUsed = new GUIStyleName();
+        public static GUIStyleName Slider_LineUnused = new GUIStyleName();
+
+        public static GUIStyleName StrokeColor = new GUIStyleName();
+        public static GUIStyleName StrokeWidth = new GUIStyleName();
+        public static GUIStyleName FillColor = new GUIStyleName();
+
+        public static GUIStyleName GradientLeftColor = new GUIStyleName();
+        public static GUIStyleName GradientTopColor = new GUIStyleName();
+        public static GUIStyleName GradientRightColor = new GUIStyleName();
+        public static GUIStyleName GradientBottomColor = new GUIStyleName();
+
+        public static GUIStyleName MinTextureCoordinateU = new GUIStyleName();
+        public static GUIStyleName MaxTextureCoordinateU = new GUIStyleName();
+        public static GUIStyleName MinTextureCoordinateV = new GUIStyleName();
+        public static GUIStyleName MaxTextureCoordinateV = new GUIStyleName();
+
+        public static GUIStyleName _FieldWidth = new GUIStyleName();
+        public static GUIStyleName _ControlLabelSpacing = new GUIStyleName();
+        public static GUIStyleName _LabelWidth = new GUIStyleName();
+        public static GUIStyleName _LabelHeight = new GUIStyleName();
+
+        public static GUIStyleName WindowRounding = new GUIStyleName();
+        public static GUIStyleName ResizeGripColor = new GUIStyleName();
+        public static GUIStyleName WindowBorderColor = new GUIStyleName();
+        public static GUIStyleName WindowShadowColor = new GUIStyleName();
+        public static GUIStyleName WindowShadowWidth = new GUIStyleName();
+
+        public static GUIStyleName ScrollBarWidth = new GUIStyleName();
+        public static GUIStyleName ScrollBarBackgroundColor = new GUIStyleName();
+        public static GUIStyleName ScrollBarButtonColor = new GUIStyleName();
     }
 }
diff --git a/templates/UniversalAppTemplate/UniversalAppTemplate.csproj b/templates/UniversalAppTemplate/UniversalAppTemplate.csproj
@@ -24,7 +24,5 @@
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
-
-  <Import Project="..\Demo\Demo.projitems" Label="Shared" />
 
 </Project>