From 997c7dc3740432a92f346119c6a93c93a897fb53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 29 Oct 2013 10:21:47 +0100 Subject: [PATCH] Simplify some UI code, fix enabled-ness of Tilt analog settings --- Core/Config.cpp | 2 +- UI/GameSettingsScreen.cpp | 19 ++++--------------- UI/GameSettingsScreen.h | 2 -- UI/NativeApp.cpp | 2 +- native | 2 +- 5 files changed, 7 insertions(+), 20 deletions(-) diff --git a/Core/Config.cpp b/Core/Config.cpp index 246f9ed3a..80ae8d41b 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -219,7 +219,7 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename) { // control->Get("KeyMapping",iMappingMap); #ifdef USING_GLES2 control->Get("AccelerometerToAnalogHoriz", &bAccelerometerToAnalogHoriz, false); - + control->Get("TiltBaseX", &fTiltBaseX, 0); control->Get("TiltBaseY", &fTiltBaseY, 0); control->Get("InvertTiltX", &bInvertTiltX, false); diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index c2d9b4e80..732c5f927 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -102,7 +102,7 @@ void GameSettingsScreen::CreateViews() { graphicsSettings->Add(new ItemHeader(gs->T("Rendering Mode"))); static const char *renderingMode[] = { "Non-Buffered Rendering", "Buffered Rendering", "Read Framebuffers To Memory (CPU)", "Read Framebuffers To Memory (GPU)"}; - graphicsSettings->Add(new PopupMultiChoice(&g_Config.iRenderingMode, gs->T("Mode"), renderingMode, 0, ARRAY_SIZE(renderingMode), gs, screenManager()))->OnChoice.Handle(this, &GameSettingsScreen::OnRenderingMode); + graphicsSettings->Add(new PopupMultiChoice(&g_Config.iRenderingMode, gs->T("Mode"), renderingMode, 0, ARRAY_SIZE(renderingMode), gs, screenManager())); graphicsSettings->Add(new ItemHeader(gs->T("Frame Rate Control"))); static const char *frameSkip[] = {"Off", "Auto", "1", "2", "3", "4", "5", "6", "7", "8"}; @@ -220,13 +220,13 @@ void GameSettingsScreen::CreateViews() { controlsSettings->Add(new CheckBox(&g_Config.bAccelerometerToAnalogHoriz, c->T("Tilt", "Tilt to Analog (horizontal)"))); Choice *tiltAnalog = controlsSettings->Add(new Choice(c->T("Customize tilt"))); tiltAnalog->OnClick.Handle(this, &GameSettingsScreen::OnTiltAnalogSettings); - tiltAnalog->SetEnabled(g_Config.bAccelerometerToAnalogHoriz); + tiltAnalog->SetEnabledPtr(&g_Config.bAccelerometerToAnalogHoriz); #endif controlsSettings->Add(new ItemHeader(c->T("OnScreen", "On-Screen Touch Controls"))); - controlsSettings->Add(new CheckBox(&g_Config.bShowTouchControls, c->T("OnScreen", "On-Screen Touch Controls")))->OnClick.Handle(this, &GameSettingsScreen::OnToggleTouchControls); + controlsSettings->Add(new CheckBox(&g_Config.bShowTouchControls, c->T("OnScreen", "On-Screen Touch Controls"))); layoutEditorChoice_ = controlsSettings->Add(new Choice(c->T("Custom layout..."))); layoutEditorChoice_->OnClick.Handle(this, &GameSettingsScreen::OnTouchControlLayout); - layoutEditorChoice_->SetEnabled(g_Config.bShowTouchControls); + layoutEditorChoice_->SetEnabledPtr(&g_Config.bShowTouchControls); controlsSettings->Add(new PopupSliderChoice(&g_Config.iTouchButtonOpacity, 0, 100, c->T("Button Opacity"), screenManager())); controlsSettings->Add(new PopupSliderChoiceFloat(&g_Config.fButtonScale, 0.80, 2.0, c->T("Button Scaling"), screenManager())); @@ -285,11 +285,6 @@ void GameSettingsScreen::CreateViews() { systemSettings->Add(new PopupMultiChoice(&g_Config.iButtonPreference, s->T("Confirmation Button"), buttonPref, 0, 2, s, screenManager())); } -UI::EventReturn GameSettingsScreen::OnToggleTouchControls(UI::EventParams &e) { - layoutEditorChoice_->SetEnabled(g_Config.bShowTouchControls); - return UI::EVENT_DONE; -} - UI::EventReturn GameSettingsScreen::OnClearRecents(UI::EventParams &e) { g_Config.recentIsos.clear(); OnRecentChanged.Trigger(e); @@ -302,12 +297,6 @@ UI::EventReturn GameSettingsScreen::OnReloadCheats(UI::EventParams &e) { return UI::EVENT_DONE; } -UI::EventReturn GameSettingsScreen::OnRenderingMode(UI::EventParams &e) { - enableReports_ = Reporting::IsEnabled(); - enableReportsCheckbox_->SetEnabled(Reporting::IsSupported()); - return UI::EVENT_DONE; -} - UI::EventReturn GameSettingsScreen::OnFullscreenChange(UI::EventParams &e) { host->GoFullscreen(g_Config.bFullScreen); return UI::EVENT_DONE; diff --git a/UI/GameSettingsScreen.h b/UI/GameSettingsScreen.h index 1c3641860..3cb771b9a 100644 --- a/UI/GameSettingsScreen.h +++ b/UI/GameSettingsScreen.h @@ -53,7 +53,6 @@ private: UI::EventReturn OnTouchControlLayout(UI::EventParams &e); UI::EventReturn OnDumpNextFrameToLog(UI::EventParams &e); UI::EventReturn OnReloadCheats(UI::EventParams &e); - UI::EventReturn OnToggleTouchControls(UI::EventParams &e); UI::EventReturn OnTiltAnalogSettings(UI::EventParams &e); // Global settings handlers @@ -64,7 +63,6 @@ private: UI::EventReturn OnDeveloperTools(UI::EventParams &e); UI::EventReturn OnChangeNickname(UI::EventParams &e); UI::EventReturn OnClearRecents(UI::EventParams &e); - UI::EventReturn OnRenderingMode(UI::EventParams &e); UI::EventReturn OnFullscreenChange(UI::EventParams &e); UI::EventReturn OnResolutionChange(UI::EventParams &e); UI::EventReturn OnShaderChange(UI::EventParams &e); diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp index 4ac617d46..5b6c27b0d 100644 --- a/UI/NativeApp.cpp +++ b/UI/NativeApp.cpp @@ -466,7 +466,7 @@ void NativeInitGraphics() { ui_theme.itemDownStyle.background = UI::Drawable(0xFFbd9939); ui_theme.itemDownStyle.fgColor = 0xFFFFFFFF; ui_theme.itemDisabledStyle.background = UI::Drawable(0x55E0D4AF); - ui_theme.itemDisabledStyle.fgColor = 0xFFcccccc; + ui_theme.itemDisabledStyle.fgColor = 0x80EEEEEE; ui_theme.itemHighlightedStyle.background = UI::Drawable(0x55bdBB39); ui_theme.itemHighlightedStyle.fgColor = 0xFFFFFFFF; diff --git a/native b/native index 2b63ad24c..b2bc4ffa8 160000 --- a/native +++ b/native @@ -1 +1 @@ -Subproject commit 2b63ad24ca99e5c6ec483ccaa25ce6c19e8d5af1 +Subproject commit b2bc4ffa8e099452de2b7477398267ce931cfb7a