From 1da49273b56d711ae7921e005ac21eb6fa5f3f65 Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Sat, 10 Aug 2013 19:23:50 +0200 Subject: [PATCH] Address some complaints about touch button opacity --- Core/Config.cpp | 2 +- UI/GameSettingsScreen.cpp | 2 +- UI/GamepadEmu.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Core/Config.cpp b/Core/Config.cpp index 628be9b1cc..e3c614c6e0 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -138,7 +138,7 @@ void Config::Load(const char *iniFileName) sound->Get("VolumeSFX", &iSFXVolume, 7); IniFile::Section *control = iniFile.GetOrCreateSection("Control"); - control->Get("ShowStick", &bShowAnalogStick, false); + control->Get("ShowAnalogStick", &bShowAnalogStick, true); #ifdef BLACKBERRY control->Get("ShowTouchControls", &bShowTouchControls, pixel_xres != pixel_yres); #elif defined(USING_GLES2) diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index 8549a4dbad..83baf7b788 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -270,7 +270,7 @@ void GameSettingsScreen::CreateViews() { controlsSettings->Add(new CheckBox(&g_Config.bShowAnalogStick, c->T("Show Left Analog Stick"))); controlsSettings->Add(new CheckBox(&g_Config.bAccelerometerToAnalogHoriz, c->T("Tilt", "Tilt to Analog (horizontal)"))); controlsSettings->Add(new Choice(gs->T("Control Mapping")))->OnClick.Handle(this, &GameSettingsScreen::OnControlMapping); - controlsSettings->Add(new PopupSliderChoice(&g_Config.iTouchButtonOpacity, 15, 65, c->T("Button Opacity"), screenManager())); + controlsSettings->Add(new PopupSliderChoice(&g_Config.iTouchButtonOpacity, 0, 85, c->T("Button Opacity"), screenManager())); // System ViewGroup *systemSettingsScroll = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, FILL_PARENT)); diff --git a/UI/GamepadEmu.cpp b/UI/GamepadEmu.cpp index b0d0dc5fa2..76cee2b60f 100644 --- a/UI/GamepadEmu.cpp +++ b/UI/GamepadEmu.cpp @@ -58,7 +58,7 @@ void MultiTouchButton::Draw(UIContext &dc) { float scale = scale_; if (IsDown()) { scale *= 2.0f; - opacity = 100.0f; + opacity *= 1.15f; } uint32_t colorBg = colorAlpha(0xc0b080, opacity); uint32_t color = colorAlpha(0xFFFFFF, opacity);