move rounded corner size calc to a EditorState method

vsicurella · Jun 4, 2024 · 386236a · 386236a
1 parent 8d3ee5d
commit 386236a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/Source/LumatoneEditorLookAndFeel.h b/Source/LumatoneEditorLookAndFeel.h
@@ -59,6 +59,11 @@ class LumatoneEditorLookAndFeel : public LookAndFeel_V4
         return getAppFont(LumatoneEditorFont::GothamNarrowMedium, height);
     }
 
+    float getRoundedRectCornerToAppHeightRatio() const
+    {
+        return 0.00555556f;
+    }
+
 public:
     //==================================================================
     // LookAndFeel_V4 Implementation
@@ -1292,7 +1297,8 @@ class LumatoneEditorLookAndFeel : public LookAndFeel_V4
         setColour(LumatoneEditorColourIDs::HeaderBackground,                Colour(0xff1a1b1c));
         setColour(LumatoneEditorColourIDs::MediumBackground,                Colour(0xff212529));
         setColour(LumatoneEditorColourIDs::LightBackground,                 Colour(0xff272b2e));
-        setColour(LumatoneEditorColourIDs::ControlAreaBackground,           Colour(0xff212626));
+        setColour(LumatoneEditorColourIDs::ControlAreaHeader,               Colour(0xff272b2e));
+        setColour(LumatoneEditorColourIDs::ControlAreaBackground,           Colour(0xff2d3135));
         setColour(LumatoneEditorColourIDs::ActiveText,                      Colours::white);
         setColour(LumatoneEditorColourIDs::InactiveText,                    Colour(0xffb1b1b1));
         setColour(LumatoneEditorColourIDs::DescriptionText,                 Colour(0xffcbcbcb));

diff --git a/Source/LumatoneEditorState.cpp b/Source/LumatoneEditorState.cpp
@@ -78,6 +78,11 @@ LumatoneEditorState::~LumatoneEditorState()
     appFonts = nullptr;
 }
 
+float LumatoneEditorState::getRoundedRectCornerSize() const
+{
+    return windowBounds.getHeight() * lookAndFeel->getRoundedRectCornerToAppHeightRatio();
+}
+
 juce::String LumatoneEditorState::getProperty(juce::Identifier propertyId, juce::String fallbackValue) const
 {
     return propertiesFile->getValue(propertyId, fallbackValue);

diff --git a/Source/LumatoneEditorState.h b/Source/LumatoneEditorState.h
@@ -86,6 +86,7 @@ class LumatoneEditorState : public LumatoneApplicationState
 	const juce::String getApplicationVersion() const { return ProjectInfo::versionString; }
 
     juce::Rectangle<int> getWindowBounds() const { return windowBounds; }
+    float getRoundedRectCornerSize() const;
 
     bool getHasChangesToSave() const { return hasChangesToSave; }
     bool getInCalibrationMode() const { return inCalibrationMode; }

diff --git a/Source/LumatoneEditorStyleCommon.h b/Source/LumatoneEditorStyleCommon.h
@@ -27,9 +27,6 @@
 #define PATH_PI_2_CW   1.5707963 // pi / 2
 #define PATH_PI_2_CCW -1.5707963
 
-// Rounded corner size over app height ratio for layout elements
-#define ROUNDEDCORNERTOAPPHEIGHT 0.00555556f
-
 #if JUCE_MAC
     #define GLOBALFONTSCALAR 0.9f
     #define CONTROLBOXFONTHEIGHTSCALAR 0.7f
@@ -610,6 +607,7 @@ enum LumatoneEditorColourIDs
     HeaderBackground,
     MediumBackground,
     LightBackground,
+    ControlAreaHeader,
     ControlAreaBackground,
     ControlBoxHighlighted,
     ActiveText,