chore: sync workspace state

editor/src/UI/StyleTokens.h

@@ -118,6 +118,14 @@ inline ImVec2 ControlFramePadding() {
     return ImVec2(3.0f, 0.0f);
 }
 
+inline ImVec2 ScalarControlFramePadding() {
+    return ImVec2(3.0f, 2.0f);
+}
+
+inline float CompactIndicatorSize() {
+    return 18.0f;
+}
+
 inline float ControlRowHeightOffset() {
     return 1.0f;
 }
@@ -138,12 +146,16 @@ inline float SliderValueFieldWidth() {
     return 64.0f;
 }
 
+inline float ComboPreviewHeightOffset() {
+    return -2.0f;
+}
+
 inline float LinearSliderTrackThickness() {
-    return 2.0f;
+    return 3.0f;
 }
 
 inline float LinearSliderGrabRadius() {
-    return 5.0f;
+    return 6.0f;
 }
 
 inline float LinearSliderHorizontalPadding() {
@@ -381,19 +393,43 @@ inline ImVec2 InspectorActionButtonPadding() {
 }
 
 inline ImVec2 PopupWindowPadding() {
-    return ImVec2(12.0f, 10.0f);
+    return ImVec2(10.0f, 0.0f);
 }
 
 inline ImVec2 ComboPopupWindowPadding() {
-    return ImVec2(6.0f, 1.0f);
+    return ImVec2(5.0f, 0.0f);
 }
 
 inline ImVec2 ComboPopupItemSpacing() {
     return ImVec2(0.0f, 0.0f);
 }
 
+inline ImVec4 MenuSurfaceColor() {
+    return ImVec4(0.98f, 0.98f, 0.98f, 1.0f);
+}
+
+inline ImVec4 MenuSurfaceHoverColor() {
+    return ImVec4(0.97f, 0.97f, 0.97f, 1.0f);
+}
+
+inline ImVec4 MenuSurfaceActiveColor() {
+    return ImVec4(0.955f, 0.955f, 0.955f, 1.0f);
+}
+
+inline ImVec4 MenuBorderColor() {
+    return ImVec4(0.84f, 0.84f, 0.84f, 1.0f);
+}
+
+inline ImVec4 MenuTextColor() {
+    return ImVec4(0.16f, 0.16f, 0.16f, 1.0f);
+}
+
+inline ImVec4 MenuTextDisabledColor() {
+    return ImVec4(0.47f, 0.47f, 0.47f, 1.0f);
+}
+
 inline float ComboPopupRounding() {
-    return 1.0f;
+    return 3.0f;
 }
 
 inline float ComboPopupBorderSize() {
@@ -401,15 +437,15 @@ inline float ComboPopupBorderSize() {
 }
 
 inline ImVec4 ComboPopupBackgroundColor() {
-    return ImVec4(1.0f, 1.0f, 1.0f, 1.0f);
+    return MenuSurfaceColor();
 }
 
 inline ImVec4 ComboPopupTextColor() {
-    return ImVec4(0.14f, 0.14f, 0.14f, 1.0f);
+    return MenuTextColor();
 }
 
 inline ImVec4 ComboPopupTextDisabledColor() {
-    return ImVec4(0.55f, 0.55f, 0.55f, 1.0f);
+    return MenuTextDisabledColor();
 }
 
 inline ImVec4 ComboPopupItemColor() {
@@ -417,27 +453,39 @@ inline ImVec4 ComboPopupItemColor() {
 }
 
 inline ImVec4 ComboPopupItemHoveredColor() {
-    return ImVec4(0.0f, 0.0f, 0.0f, 0.045f);
+    return MenuSurfaceHoverColor();
 }
 
 inline ImVec4 ComboPopupItemActiveColor() {
-    return ImVec4(0.0f, 0.0f, 0.0f, 0.08f);
+    return MenuSurfaceActiveColor();
 }
 
 inline ImVec4 ComboPopupCheckMarkColor() {
-    return ImVec4(0.20f, 0.20f, 0.20f, 1.0f);
+    return MenuTextColor();
 }
 
 inline float PopupWindowRounding() {
-    return 5.0f;
+    return 3.0f;
 }
 
 inline float PopupWindowBorderSize() {
-    return 0.0f;
+    return 1.0f;
 }
 
 inline float PopupFrameRounding() {
-    return 4.0f;
+    return 3.0f;
+}
+
+inline float PopupSubmenuArrowExtent() {
+    return 8.0f;
+}
+
+inline float PopupSubmenuArrowTrailingInset() {
+    return 8.0f;
+}
+
+inline float PopupSubmenuOpenOffsetX() {
+    return 0.0f;
 }
 
 inline float PopupFrameBorderSize() {
@@ -445,19 +493,19 @@ inline float PopupFrameBorderSize() {
 }
 
 inline ImVec4 PopupBackgroundColor() {
-    return ImVec4(1.0f, 1.0f, 1.0f, 1.0f);
+    return MenuSurfaceColor();
 }
 
 inline ImVec4 PopupBorderColor() {
-    return ImVec4(0.0f, 0.0f, 0.0f, 0.10f);
+    return MenuBorderColor();
 }
 
 inline ImVec4 PopupTextColor() {
-    return ImVec4(0.14f, 0.14f, 0.14f, 1.0f);
+    return MenuTextColor();
 }
 
 inline ImVec4 PopupTextDisabledColor() {
-    return ImVec4(0.55f, 0.55f, 0.55f, 1.0f);
+    return MenuTextDisabledColor();
 }
 
 inline ImVec4 PopupItemColor() {
@@ -465,39 +513,39 @@ inline ImVec4 PopupItemColor() {
 }
 
 inline ImVec4 PopupItemHoveredColor() {
-    return ImVec4(0.0f, 0.0f, 0.0f, 0.06f);
+    return MenuSurfaceHoverColor();
 }
 
 inline ImVec4 PopupItemActiveColor() {
-    return ImVec4(0.0f, 0.0f, 0.0f, 0.10f);
+    return MenuSurfaceActiveColor();
 }
 
 inline ImVec4 PopupFrameColor() {
-    return ImVec4(1.0f, 1.0f, 1.0f, 1.0f);
+    return MenuSurfaceColor();
 }
 
 inline ImVec4 PopupFrameHoveredColor() {
-    return ImVec4(0.965f, 0.965f, 0.965f, 1.0f);
+    return MenuSurfaceHoverColor();
 }
 
 inline ImVec4 PopupFrameActiveColor() {
-    return ImVec4(0.94f, 0.94f, 0.94f, 1.0f);
+    return MenuSurfaceActiveColor();
 }
 
 inline ImVec4 PopupButtonColor() {
-    return ImVec4(0.95f, 0.95f, 0.95f, 1.0f);
+    return MenuSurfaceColor();
 }
 
 inline ImVec4 PopupButtonHoveredColor() {
-    return ImVec4(0.90f, 0.90f, 0.90f, 1.0f);
+    return MenuSurfaceHoverColor();
 }
 
 inline ImVec4 PopupButtonActiveColor() {
-    return ImVec4(0.86f, 0.86f, 0.86f, 1.0f);
+    return MenuSurfaceActiveColor();
 }
 
 inline ImVec4 PopupCheckMarkColor() {
-    return ImVec4(0.20f, 0.20f, 0.20f, 1.0f);
+    return MenuTextColor();
 }
 
 inline ImVec2 AssetTileSize() {
@@ -556,14 +604,22 @@ inline ImVec2 AssetTileIconSize() {
     return ImVec2(32.0f, 24.0f);
 }
 
-inline ImVec2 FolderAssetTileIconSize() {
+inline ImVec2 ProjectAssetTileIconSize() {
     return ImVec2(72.0f, 72.0f);
 }
 
-inline ImVec2 FolderAssetTileIconOffset() {
+inline ImVec2 ProjectAssetTileIconOffset() {
     return ImVec2(0.0f, 2.0f);
 }
 
+inline ImVec2 FolderAssetTileIconSize() {
+    return ProjectAssetTileIconSize();
+}
+
+inline ImVec2 FolderAssetTileIconOffset() {
+    return ProjectAssetTileIconOffset();
+}
+
 inline float AssetTileIconTextGap() {
     return 4.0f;
 }