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

(Android) Added fade-out support to the touch overlay

Browse source
This commit is contained in:
Leon Styhre 2024-01-14 21:55:09 +01:00
parent 0c03583f80
commit c27ee24cc4
4 changed files with 42 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
es-app/src/guis/GuiMenu.cpp
View file

@ -1171,6 +1171,21 @@ void GuiMenu::openInputDeviceOptions()
}
});
// Touch overlay fade-out timer.
auto touchOverlayFadeTime = std::make_shared<SliderComponent>(0.0f, 20.0f, 1.0f, "s");
touchOverlayFadeTime->setValue(
static_cast<float>(Settings::getInstance()->getInt("InputTouchOverlayFadeTime")));
s->addWithLabel("TOUCH OVERLAY FADE-OUT TIME", touchOverlayFadeTime);
s->addSaveFunc([touchOverlayFadeTime, s] {
if (touchOverlayFadeTime->getValue() !=
static_cast<float>(Settings::getInstance()->getInt("InputTouchOverlayFadeTime"))) {
Settings::getInstance()->setInt("InputTouchOverlayFadeTime",
static_cast<int>(touchOverlayFadeTime->getValue()));
InputOverlay::getInstance().resetFadeTimer();
s->setNeedsSaving();
}
});
// Whether to enable the touch overlay.
auto inputTouchOverlay = std::make_shared<SwitchComponent>();
inputTouchOverlay->setState(Settings::getInstance()->getBool("InputTouchOverlay"));
@ -1179,12 +1194,10 @@ void GuiMenu::openInputDeviceOptions()
if (Settings::getInstance()->getBool("InputTouchOverlay") !=
inputTouchOverlay->getState()) {
Settings::getInstance()->setBool("InputTouchOverlay", inputTouchOverlay->getState());
if (Settings::getInstance()->getBool("InputTouchOverlay"))
InputOverlay::getInstance().createButtons();
else
InputOverlay::getInstance().clearButtons();
s->setNeedsSaving();
}
});
@ -1195,9 +1208,16 @@ void GuiMenu::openInputDeviceOptions()
touchOverlaySize->getParent()
->getChild(touchOverlaySize->getChildIndex() - 1)
->setOpacity(DISABLED_OPACITY);
touchOverlayFadeTime->setEnabled(false);
touchOverlayFadeTime->setOpacity(DISABLED_OPACITY);
touchOverlayFadeTime->getParent()
->getChild(touchOverlayFadeTime->getChildIndex() - 1)
->setOpacity(DISABLED_OPACITY);
}
auto inputTouchOverlayCallback = [this, inputTouchOverlay, touchOverlaySize]() {
auto inputTouchOverlayCallback = [this, inputTouchOverlay, touchOverlaySize,
touchOverlayFadeTime]() {
if (!inputTouchOverlay->getState()) {
const std::string message {
"DON'T DISABLE THE TOUCH OVERLAY UNLESS YOU ARE USING A CONTROLLER OR YOU WILL "
@ -1221,6 +1241,12 @@ void GuiMenu::openInputDeviceOptions()
touchOverlaySize->getParent()
->getChild(touchOverlaySize->getChildIndex() - 1)
->setOpacity(DISABLED_OPACITY);
touchOverlayFadeTime->setEnabled(false);
touchOverlayFadeTime->setOpacity(DISABLED_OPACITY);
touchOverlayFadeTime->getParent()
->getChild(touchOverlayFadeTime->getChildIndex() - 1)
->setOpacity(DISABLED_OPACITY);
}
else {
touchOverlaySize->setEnabled(true);
@ -1228,6 +1254,12 @@ void GuiMenu::openInputDeviceOptions()
touchOverlaySize->getParent()
->getChild(touchOverlaySize->getChildIndex() - 1)
->setOpacity(1.0f);
touchOverlayFadeTime->setEnabled(true);
touchOverlayFadeTime->setOpacity(1.0f);
touchOverlayFadeTime->getParent()
->getChild(touchOverlayFadeTime->getChildIndex() - 1)
->setOpacity(1.0f);
}
};

2
es-app/src/main.cpp
View file

@ -896,7 +896,7 @@ int main(int argc, char* argv[])
}
#if defined(__ANDROID__)
InputOverlay::getInstance();
InputOverlay::getInstance().init();
LOG(LogDebug) << "Android API level: " << SDL_GetAndroidSDKVersion();
Utils::Platform::Android::printDeviceInfo();

1
es-core/src/Settings.cpp
View file

@ -241,6 +241,7 @@ void Settings::setDefaults()
mStringMap["InputControllerType"] = {"xbox", "xbox"};
#if defined(__ANDROID__)
mStringMap["InputTouchOverlaySize"] = {"medium", "medium"};
mIntMap["InputTouchOverlayFadeTime"] = {6, 6};
mBoolMap["InputTouchOverlay"] = {true, true};
#endif
mBoolMap["InputOnlyFirstController"] = {false, false};

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

@ -447,6 +447,11 @@ void Window::update(int deltaTime)
if (mScreensaver && mRenderScreensaver)
mScreensaver->update(deltaTime);
#if defined(__ANDROID__)
if (Settings::getInstance()->getBool("InputTouchOverlay"))
InputOverlay::getInstance().update(deltaTime);
#endif
}
bool Window::isBackgroundDimmed()