diff --git a/es-app/src/views/ViewController.cpp b/es-app/src/views/ViewController.cpp index 962dd9db1..1e2f57404 100644 --- a/es-app/src/views/ViewController.cpp +++ b/es-app/src/views/ViewController.cpp @@ -65,12 +65,12 @@ void ViewController::setMenuColors() mMenuColorFrame = 0x191919FF; mMenuColorFrameLaunchScreen = 0x121212FF; mMenuColorFrameBusyComponent = 0x090909FF; - mMenuColorPanelDimmed = 0x00000032; + mMenuColorPanelDimmed = 0x00000024; - mMenuColorTitle = 0xA6A6A6FF; - mMenuColorPrimary = 0x909090FF; - mMenuColorSecondary = 0xA3A3A3FF; - mMenuColorTertiary = 0xA0A0A0FF; + mMenuColorTitle = 0x969696FF; + mMenuColorPrimary = 0x808080FF; + mMenuColorSecondary = 0x939393FF; + mMenuColorTertiary = 0x909090FF; mMenuColorRed = 0xCA3E3EFF; mMenuColorGreen = 0x449944FF; mMenuColorBlue = 0x4757ddff; @@ -78,12 +78,12 @@ void ViewController::setMenuColors() mMenuColorSelector = 0x070707FF; mMenuColorSeparators = 0x303030FF; mMenuColorBusyComponent = 0x888888FF; - mMenuColorScrollIndicators = 0x929292FF; + mMenuColorScrollIndicators = 0x909090FF; mMenuColorPopupText = 0xBBBBBBFF; mMenuColorButtonFocused = 0x050505FF; mMenuColorButtonTextFocused = 0xAFAFAFFF; - mMenuColorButtonTextUnfocused = 0x878787FF; + mMenuColorButtonTextUnfocused = 0x808080FF; mMenuColorButtonFlatFocused = 0x090909FF; mMenuColorButtonFlatUnfocused = 0x242424FF; @@ -94,8 +94,7 @@ void ViewController::setMenuColors() mMenuColorTextInputFrameFocused = 0x090909FF; mMenuColorTextInputFrameUnfocused = 0x242424FF; - mMenuColorSlider = 0xAAAAAAFF; - mMenuColorSliderKnobDisabled = 0x464646FF; + mMenuColorSliderKnobDisabled = 0x393939FF; mMenuColorDateTimeEditMarker = 0xFFFFFF22; mMenuColorDetectDeviceHeld = 0x99999900; } @@ -132,7 +131,6 @@ void ViewController::setMenuColors() mMenuColorTextInputFrameFocused = 0xFFFFFFFF; mMenuColorTextInputFrameUnfocused = 0xFFFFFFFF; - mMenuColorSlider = 0x777777FF; mMenuColorSliderKnobDisabled = 0xC9C9C9FF; mMenuColorDateTimeEditMarker = 0x00000022; mMenuColorDetectDeviceHeld = 0x44444400; diff --git a/es-core/src/GuiComponent.h b/es-core/src/GuiComponent.h index 7f61b29aa..cd8873afb 100644 --- a/es-core/src/GuiComponent.h +++ b/es-core/src/GuiComponent.h @@ -380,7 +380,6 @@ protected: static inline unsigned int mMenuColorTextInputFrameFocused {0x777777FF}; static inline unsigned int mMenuColorTextInputFrameUnfocused {0xFFFFFFFF}; - static inline unsigned int mMenuColorSlider {0x777777FF}; static inline unsigned int mMenuColorSliderKnobDisabled {0xC9C9C9FF}; static inline unsigned int mMenuColorDateTimeEditMarker {0x00000022}; static inline unsigned int mMenuColorDetectDeviceHeld {0x44444400}; diff --git a/es-core/src/components/SliderComponent.cpp b/es-core/src/components/SliderComponent.cpp index 2e5c499a0..181bf7bd8 100644 --- a/es-core/src/components/SliderComponent.cpp +++ b/es-core/src/components/SliderComponent.cpp @@ -35,7 +35,7 @@ SliderComponent::SliderComponent(float min, float max, float increment, const st mKnob.setResize(0.0f, std::round(mSize.y * 0.7f)); mKnob.setOrigin(0.5f, 0.0f); mKnob.setImage(":/graphics/slider_knob.svg"); - mKnob.setColorShift(mMenuColorSlider); + mKnob.setColorShift(mMenuColorPrimary); mKnobDisabled.setResize(0.0f, std::round(mSize.y * 0.7f)); mKnobDisabled.setOrigin(0.5f, 0.0f); @@ -110,8 +110,8 @@ void SliderComponent::render(const glm::mat4& parentTrans) mRenderer->drawRect( mKnob.getSize().x / 2.0f, mBarPosY, width, mBarHeight, - (mMenuColorSlider & 0xFFFFFF00) | static_cast(mOpacity * 255.0f), - (mMenuColorSlider & 0xFFFFFF00) | static_cast(mOpacity * 255.0f)); + (mMenuColorPrimary & 0xFFFFFF00) | static_cast(mOpacity * 255.0f), + (mMenuColorPrimary & 0xFFFFFF00) | static_cast(mOpacity * 255.0f)); if (mOpacity > DISABLED_OPACITY) mKnob.render(trans);