Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-22 06:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Some more changes to make the dark menu color scheme the default choice

Browse source
This commit is contained in:
Leon Styhre 2023-07-13 17:46:06 +02:00
parent 6ad9918feb
commit 954492b1f4
3 changed files with 42 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
es-app/src/views/ViewController.cpp
View file

@ -62,44 +62,7 @@ ViewController* ViewController::getInstance()
void ViewController::setMenuColors() void ViewController::setMenuColors()
{ {
if (Settings::getInstance()->getString("MenuColorScheme") == "dark") { if (Settings::getInstance()->getString("MenuColorScheme") == "light") {
mMenuColorFrame = 0x191919FF;
mMenuColorFrameLaunchScreen = 0x121212FF;
mMenuColorFrameBusyComponent = 0x090909FF;
mMenuColorPanelDimmed = 0x00000024;
mMenuColorTitle = 0x909090FF;
mMenuColorPrimary = 0x808080FF;
mMenuColorSecondary = 0x939393FF;
mMenuColorTertiary = 0x909090FF;
mMenuColorRed = 0xCA3E3EFF;
mMenuColorGreen = 0x449944FF;
mMenuColorBlue = 0x4757ddff;
mMenuColorSelector = 0x000000FF;
mMenuColorSeparators = 0x303030FF;
mMenuColorBusyComponent = 0x888888FF;
mMenuColorScrollIndicators = 0x707070FF;
mMenuColorPopupText = 0xBBBBBBFF;
mMenuColorButtonFocused = 0x050505FF;
mMenuColorButtonTextFocused = 0xAFAFAFFF;
mMenuColorButtonTextUnfocused = 0x808080FF;
mMenuColorButtonFlatFocused = 0x090909FF;
mMenuColorButtonFlatUnfocused = 0x242424FF;
mMenuColorKeyboardModifier = 0xC62F2FFF;
mMenuColorKeyboardCursorFocused = 0xAAAAAAFF;
mMenuColorKeyboardCursorUnfocused = 0x666666FF;
mMenuColorKeyboardText = 0x92929200;
mMenuColorTextInputFrameFocused = 0x090909FF;
mMenuColorTextInputFrameUnfocused = 0x242424FF;
mMenuColorSliderKnobDisabled = 0x393939FF;
mMenuColorDateTimeEditMarker = 0xFFFFFF22;
mMenuColorDetectDeviceHeld = 0x99999900;
}
else {
mMenuColorFrame = 0xEFEFEFFF; mMenuColorFrame = 0xEFEFEFFF;
mMenuColorFrameLaunchScreen = 0xDFDFDFFF; mMenuColorFrameLaunchScreen = 0xDFDFDFFF;
mMenuColorFrameBusyComponent = 0xFFFFFFFF; mMenuColorFrameBusyComponent = 0xFFFFFFFF;
@ -136,6 +99,43 @@ void ViewController::setMenuColors()
mMenuColorDateTimeEditMarker = 0x00000022; mMenuColorDateTimeEditMarker = 0x00000022;
mMenuColorDetectDeviceHeld = 0x44444400; mMenuColorDetectDeviceHeld = 0x44444400;
} }
else {
mMenuColorFrame = 0x191919FF;
mMenuColorFrameLaunchScreen = 0x121212FF;
mMenuColorFrameBusyComponent = 0x090909FF;
mMenuColorPanelDimmed = 0x00000024;
mMenuColorTitle = 0x909090FF;
mMenuColorPrimary = 0x808080FF;
mMenuColorSecondary = 0x939393FF;
mMenuColorTertiary = 0x909090FF;
mMenuColorRed = 0xCA3E3EFF;
mMenuColorGreen = 0x449944FF;
mMenuColorBlue = 0x4757ddff;
mMenuColorSelector = 0x000000FF;
mMenuColorSeparators = 0x303030FF;
mMenuColorBusyComponent = 0x888888FF;
mMenuColorScrollIndicators = 0x707070FF;
mMenuColorPopupText = 0xBBBBBBFF;
mMenuColorButtonFocused = 0x050505FF;
mMenuColorButtonTextFocused = 0xAFAFAFFF;
mMenuColorButtonTextUnfocused = 0x808080FF;
mMenuColorButtonFlatFocused = 0x090909FF;
mMenuColorButtonFlatUnfocused = 0x242424FF;
mMenuColorKeyboardModifier = 0xC62F2FFF;
mMenuColorKeyboardCursorFocused = 0xAAAAAAFF;
mMenuColorKeyboardCursorUnfocused = 0x666666FF;
mMenuColorKeyboardText = 0x92929200;
mMenuColorTextInputFrameFocused = 0x090909FF;
mMenuColorTextInputFrameUnfocused = 0x242424FF;
mMenuColorSliderKnobDisabled = 0x393939FF;
mMenuColorDateTimeEditMarker = 0xFFFFFF22;
mMenuColorDetectDeviceHeld = 0x99999900;
}
} }
void ViewController::invalidSystemsFileDialog() void ViewController::invalidSystemsFileDialog()

6
es-core/src/Window.cpp
View file

@ -579,10 +579,10 @@ void Window::render()
// clang-format on // clang-format on
// Also dim the background slightly. // Also dim the background slightly.
if (Settings::getInstance()->getString("MenuColorScheme") == "dark") if (Settings::getInstance()->getString("MenuColorScheme") == "light")
backgroundParameters.dimming = 0.80f;
else
backgroundParameters.dimming = 0.60f; backgroundParameters.dimming = 0.60f;
else
backgroundParameters.dimming = 0.80f;
mRenderer->shaderPostprocessing(Renderer::Shader::CORE | mRenderer->shaderPostprocessing(Renderer::Shader::CORE |
Renderer::Shader::BLUR_HORIZONTAL | Renderer::Shader::BLUR_HORIZONTAL |

2
es-core/src/components/ComponentList.cpp
View file

@ -311,7 +311,7 @@ void ComponentList::render(const glm::mat4& parentTrans)
trans = glm::translate(trans, glm::vec3 {0.0f, -mCameraOffset, 0.0f}); trans = glm::translate(trans, glm::vec3 {0.0f, -mCameraOffset, 0.0f});
glm::mat4 loopTrans {trans}; glm::mat4 loopTrans {trans};
const bool darkColorScheme {Settings::getInstance()->getString("MenuColorScheme") == "dark"}; const bool darkColorScheme {Settings::getInstance()->getString("MenuColorScheme") != "light"};
// Draw selector bar if we're using the dark color scheme. // Draw selector bar if we're using the dark color scheme.
if (mFocused && mOpacity == 1.0f && darkColorScheme) { if (mFocused && mOpacity == 1.0f && darkColorScheme) {