diff --git a/CMakeLists.txt b/CMakeLists.txt index ff2c70af5c..8ecd57949b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1356,8 +1356,8 @@ list(APPEND NativeAppSource UI/MemStickScreen.cpp UI/ProfilerDraw.h UI/ProfilerDraw.cpp - UI/ComboKeyMappingScreen.h - UI/ComboKeyMappingScreen.cpp + UI/CustomButtonMappingScreen.h + UI/CustomButtonMappingScreen.cpp UI/Theme.h UI/Theme.cpp ) diff --git a/Core/Config.cpp b/Core/Config.cpp index fc7b4768c7..35fc8f210b 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -945,16 +945,27 @@ static const ConfigSetting controlSettings[] = { ConfigSetting("ShowTouchSquare", &g_Config.bShowTouchSquare, true, true, true), ConfigSetting("ShowTouchTriangle", &g_Config.bShowTouchTriangle, true, true, true), - ConfigSetting("Custom0Mapping", "Custom0Image", "Custom0Shape", "Custom0Toggle", "Custom0Repeat", &g_Config.CustomKey0, {0, 0, 0, false, false}, true, true), - ConfigSetting("Custom1Mapping", "Custom1Image", "Custom1Shape", "Custom1Toggle", "Custom1Repeat", &g_Config.CustomKey1, {0, 1, 0, false, false}, true, true), - ConfigSetting("Custom2Mapping", "Custom2Image", "Custom2Shape", "Custom2Toggle", "Custom2Repeat", &g_Config.CustomKey2, {0, 2, 0, false, false}, true, true), - ConfigSetting("Custom3Mapping", "Custom3Image", "Custom3Shape", "Custom3Toggle", "Custom3Repeat", &g_Config.CustomKey3, {0, 3, 0, false, false}, true, true), - ConfigSetting("Custom4Mapping", "Custom4Image", "Custom4Shape", "Custom4Toggle", "Custom4Repeat", &g_Config.CustomKey4, {0, 4, 0, false, false}, true, true), - ConfigSetting("Custom5Mapping", "Custom5Image", "Custom5Shape", "Custom5Toggle", "Custom5Repeat", &g_Config.CustomKey5, {0, 0, 1, false, false}, true, true), - ConfigSetting("Custom6Mapping", "Custom6Image", "Custom6Shape", "Custom6Toggle", "Custom6Repeat", &g_Config.CustomKey6, {0, 1, 1, false, false}, true, true), - ConfigSetting("Custom7Mapping", "Custom7Image", "Custom7Shape", "Custom7Toggle", "Custom7Repeat", &g_Config.CustomKey7, {0, 2, 1, false, false}, true, true), - ConfigSetting("Custom8Mapping", "Custom8Image", "Custom8Shape", "Custom8Toggle", "Custom8Repeat", &g_Config.CustomKey8, {0, 3, 1, false, false}, true, true), - ConfigSetting("Custom9Mapping", "Custom9Image", "Custom9Shape", "Custom9Toggle", "Custom9Repeat", &g_Config.CustomKey9, {0, 4, 1, false, false}, true, true), + ConfigSetting("Custom0Mapping", "Custom0Image", "Custom0Shape", "Custom0Toggle", "Custom0Repeat", &g_Config.CustomButton0, {0, 0, 0, false, false}, true, true), + ConfigSetting("Custom1Mapping", "Custom1Image", "Custom1Shape", "Custom1Toggle", "Custom1Repeat", &g_Config.CustomButton1, {0, 1, 0, false, false}, true, true), + ConfigSetting("Custom2Mapping", "Custom2Image", "Custom2Shape", "Custom2Toggle", "Custom2Repeat", &g_Config.CustomButton2, {0, 2, 0, false, false}, true, true), + ConfigSetting("Custom3Mapping", "Custom3Image", "Custom3Shape", "Custom3Toggle", "Custom3Repeat", &g_Config.CustomButton3, {0, 3, 0, false, false}, true, true), + ConfigSetting("Custom4Mapping", "Custom4Image", "Custom4Shape", "Custom4Toggle", "Custom4Repeat", &g_Config.CustomButton4, {0, 4, 0, false, false}, true, true), + ConfigSetting("Custom5Mapping", "Custom5Image", "Custom5Shape", "Custom5Toggle", "Custom5Repeat", &g_Config.CustomButton5, {0, 0, 1, false, false}, true, true), + ConfigSetting("Custom6Mapping", "Custom6Image", "Custom6Shape", "Custom6Toggle", "Custom6Repeat", &g_Config.CustomButton6, {0, 1, 1, false, false}, true, true), + ConfigSetting("Custom7Mapping", "Custom7Image", "Custom7Shape", "Custom7Toggle", "Custom7Repeat", &g_Config.CustomButton7, {0, 2, 1, false, false}, true, true), + ConfigSetting("Custom8Mapping", "Custom8Image", "Custom8Shape", "Custom8Toggle", "Custom8Repeat", &g_Config.CustomButton8, {0, 3, 1, false, false}, true, true), + ConfigSetting("Custom9Mapping", "Custom9Image", "Custom9Shape", "Custom9Toggle", "Custom9Repeat", &g_Config.CustomButton9, {0, 4, 1, false, false}, true, true), + // Combo keys are going to be something else, but I don't want to break the config. + ConfigSetting("fcombo0X", "fcombo0Y", "comboKeyScale0", "ShowComboKey0", &g_Config.touchCustom0, defaultTouchPosHide, true, true), + ConfigSetting("fcombo1X", "fcombo1Y", "comboKeyScale1", "ShowComboKey1", &g_Config.touchCustom1, defaultTouchPosHide, true, true), + ConfigSetting("fcombo2X", "fcombo2Y", "comboKeyScale2", "ShowComboKey2", &g_Config.touchCustom2, defaultTouchPosHide, true, true), + ConfigSetting("fcombo3X", "fcombo3Y", "comboKeyScale3", "ShowComboKey3", &g_Config.touchCustom3, defaultTouchPosHide, true, true), + ConfigSetting("fcombo4X", "fcombo4Y", "comboKeyScale4", "ShowComboKey4", &g_Config.touchCustom4, defaultTouchPosHide, true, true), + ConfigSetting("fcombo5X", "fcombo5Y", "comboKeyScale5", "ShowComboKey5", &g_Config.touchCustom5, defaultTouchPosHide, true, true), + ConfigSetting("fcombo6X", "fcombo6Y", "comboKeyScale6", "ShowComboKey6", &g_Config.touchCustom6, defaultTouchPosHide, true, true), + ConfigSetting("fcombo7X", "fcombo7Y", "comboKeyScale7", "ShowComboKey7", &g_Config.touchCustom7, defaultTouchPosHide, true, true), + ConfigSetting("fcombo8X", "fcombo8Y", "comboKeyScale8", "ShowComboKey8", &g_Config.touchCustom8, defaultTouchPosHide, true, true), + ConfigSetting("fcombo9X", "fcombo9Y", "comboKeyScale9", "ShowComboKey9", &g_Config.touchCustom9, defaultTouchPosHide, true, true), #if defined(_WIN32) // A win32 user seeing touch controls is likely using PPSSPP on a tablet. There it makes @@ -1008,18 +1019,6 @@ static const ConfigSetting controlSettings[] = { ConfigSetting("AnalogStickX", "AnalogStickY", "AnalogStickScale", "ShowAnalogStick", &g_Config.touchAnalogStick, defaultTouchPosShow, true, true), ConfigSetting("RightAnalogStickX", "RightAnalogStickY", "RightAnalogStickScale", "ShowRightAnalogStick", &g_Config.touchRightAnalogStick, defaultTouchPosHide, true, true), - // Combo keys are going to be something else, but I don't want to break the config. - ConfigSetting("fcombo0X", "fcombo0Y", "comboKeyScale0", "ShowComboKey0", &g_Config.touchCustom0, defaultTouchPosHide, true, true), - ConfigSetting("fcombo1X", "fcombo1Y", "comboKeyScale1", "ShowComboKey1", &g_Config.touchCustom1, defaultTouchPosHide, true, true), - ConfigSetting("fcombo2X", "fcombo2Y", "comboKeyScale2", "ShowComboKey2", &g_Config.touchCustom2, defaultTouchPosHide, true, true), - ConfigSetting("fcombo3X", "fcombo3Y", "comboKeyScale3", "ShowComboKey3", &g_Config.touchCustom3, defaultTouchPosHide, true, true), - ConfigSetting("fcombo4X", "fcombo4Y", "comboKeyScale4", "ShowComboKey4", &g_Config.touchCustom4, defaultTouchPosHide, true, true), - ConfigSetting("fcombo5X", "fcombo5Y", "comboKeyScale5", "ShowComboKey5", &g_Config.touchCustom5, defaultTouchPosHide, true, true), - ConfigSetting("fcombo6X", "fcombo6Y", "comboKeyScale6", "ShowComboKey6", &g_Config.touchCustom6, defaultTouchPosHide, true, true), - ConfigSetting("fcombo7X", "fcombo7Y", "comboKeyScale7", "ShowComboKey7", &g_Config.touchCustom7, defaultTouchPosHide, true, true), - ConfigSetting("fcombo8X", "fcombo8Y", "comboKeyScale8", "ShowComboKey8", &g_Config.touchCustom8, defaultTouchPosHide, true, true), - ConfigSetting("fcombo9X", "fcombo9Y", "comboKeyScale9", "ShowComboKey9", &g_Config.touchCustom9, defaultTouchPosHide, true, true), - ConfigSetting("AnalogDeadzone", &g_Config.fAnalogDeadzone, 0.15f, true, true), ConfigSetting("AnalogInverseDeadzone", &g_Config.fAnalogInverseDeadzone, 0.0f, true, true), ConfigSetting("AnalogSensitivity", &g_Config.fAnalogSensitivity, 1.1f, true, true), diff --git a/Core/Config.h b/Core/Config.h index 002a7f94d0..f67261d361 100644 --- a/Core/Config.h +++ b/Core/Config.h @@ -378,16 +378,16 @@ public: bool bShowTouchTriangle; bool bShowTouchSquare; - ConfigCustomButton CustomKey0; - ConfigCustomButton CustomKey1; - ConfigCustomButton CustomKey2; - ConfigCustomButton CustomKey3; - ConfigCustomButton CustomKey4; - ConfigCustomButton CustomKey5; - ConfigCustomButton CustomKey6; - ConfigCustomButton CustomKey7; - ConfigCustomButton CustomKey8; - ConfigCustomButton CustomKey9; + ConfigCustomButton CustomButton0; + ConfigCustomButton CustomButton1; + ConfigCustomButton CustomButton2; + ConfigCustomButton CustomButton3; + ConfigCustomButton CustomButton4; + ConfigCustomButton CustomButton5; + ConfigCustomButton CustomButton6; + ConfigCustomButton CustomButton7; + ConfigCustomButton CustomButton8; + ConfigCustomButton CustomButton9; // Ignored on iOS and other platforms that lack pause. bool bShowTouchPause; diff --git a/UI/ComboKeyMappingScreen.cpp b/UI/CustomButtonMappingScreen.cpp similarity index 85% rename from UI/ComboKeyMappingScreen.cpp rename to UI/CustomButtonMappingScreen.cpp index fb1c71beab..1452294d4c 100644 --- a/UI/ComboKeyMappingScreen.cpp +++ b/UI/CustomButtonMappingScreen.cpp @@ -29,7 +29,7 @@ #include "Common/StringUtils.h" #include "Core/Config.h" -#include "UI/ComboKeyMappingScreen.h" +#include "UI/CustomButtonMappingScreen.h" class ButtonShapeScreen : public PopupScreen { public: @@ -133,68 +133,68 @@ void CustomKeyScreen::CreateViews() { memset(array, 0, sizeof(array)); switch (id_) { case 0: - cfg = &g_Config.CustomKey0; + cfg = &g_Config.CustomButton0; show = &g_Config.touchCustom0.show; for (int i = 0; i < ARRAY_SIZE(customKeyList); i++) - array[i] = (0x01 == ((g_Config.CustomKey0.key >> i) & 0x01)); + array[i] = (0x01 == ((g_Config.CustomButton0.key >> i) & 0x01)); break; case 1: - cfg = &g_Config.CustomKey1; + cfg = &g_Config.CustomButton1; show = &g_Config.touchCustom1.show; for (int i = 0; i < ARRAY_SIZE(customKeyList); i++) - array[i] = (0x01 == ((g_Config.CustomKey1.key >> i) & 0x01)); + array[i] = (0x01 == ((g_Config.CustomButton1.key >> i) & 0x01)); break; case 2: - cfg = &g_Config.CustomKey2; + cfg = &g_Config.CustomButton2; show = &g_Config.touchCustom2.show; for (int i = 0; i < ARRAY_SIZE(customKeyList); i++) - array[i] = (0x01 == ((g_Config.CustomKey2.key >> i) & 0x01)); + array[i] = (0x01 == ((g_Config.CustomButton2.key >> i) & 0x01)); break; case 3: - cfg = &g_Config.CustomKey3; + cfg = &g_Config.CustomButton3; show = &g_Config.touchCustom3.show; for (int i = 0; i < ARRAY_SIZE(customKeyList); i++) - array[i] = (0x01 == ((g_Config.CustomKey3.key >> i) & 0x01)); + array[i] = (0x01 == ((g_Config.CustomButton3.key >> i) & 0x01)); break; case 4: - cfg = &g_Config.CustomKey4; + cfg = &g_Config.CustomButton4; show = &g_Config.touchCustom4.show; for (int i = 0; i < ARRAY_SIZE(customKeyList); i++) - array[i] = (0x01 == ((g_Config.CustomKey4.key >> i) & 0x01)); + array[i] = (0x01 == ((g_Config.CustomButton4.key >> i) & 0x01)); break; case 5: - cfg = &g_Config.CustomKey5; + cfg = &g_Config.CustomButton5; show = &g_Config.touchCustom5.show; for (int i = 0; i < ARRAY_SIZE(customKeyList); i++) - array[i] = (0x01 == ((g_Config.CustomKey5.key >> i) & 0x01)); + array[i] = (0x01 == ((g_Config.CustomButton5.key >> i) & 0x01)); break; case 6: - cfg = &g_Config.CustomKey6; + cfg = &g_Config.CustomButton6; show = &g_Config.touchCustom6.show; for (int i = 0; i < ARRAY_SIZE(customKeyList); i++) - array[i] = (0x01 == ((g_Config.CustomKey6.key >> i) & 0x01)); + array[i] = (0x01 == ((g_Config.CustomButton6.key >> i) & 0x01)); break; case 7: - cfg = &g_Config.CustomKey7; + cfg = &g_Config.CustomButton7; show = &g_Config.touchCustom7.show; for (int i = 0; i < ARRAY_SIZE(customKeyList); i++) - array[i] = (0x01 == ((g_Config.CustomKey7.key >> i) & 0x01)); + array[i] = (0x01 == ((g_Config.CustomButton7.key >> i) & 0x01)); break; case 8: - cfg = &g_Config.CustomKey8; + cfg = &g_Config.CustomButton8; show = &g_Config.touchCustom8.show; for (int i = 0; i < ARRAY_SIZE(customKeyList); i++) - array[i] = (0x01 == ((g_Config.CustomKey8.key >> i) & 0x01)); + array[i] = (0x01 == ((g_Config.CustomButton8.key >> i) & 0x01)); break; case 9: - cfg = &g_Config.CustomKey9; + cfg = &g_Config.CustomButton9; show = &g_Config.touchCustom9.show; for (int i = 0; i < ARRAY_SIZE(customKeyList); i++) - array[i] = (0x01 == ((g_Config.CustomKey9.key >> i) & 0x01)); + array[i] = (0x01 == ((g_Config.CustomButton9.key >> i) & 0x01)); break; default: // This shouldn't happen, let's just not crash. - cfg = &g_Config.CustomKey0; + cfg = &g_Config.CustomButton0; show = &g_Config.touchCustom0.show; break; } @@ -284,34 +284,34 @@ static uint64_t arrayToInt(const bool ary[ARRAY_SIZE(CustomKeyData::customKeyLis void CustomKeyScreen::saveArray() { switch (id_) { case 0: - g_Config.CustomKey0.key = arrayToInt(array); + g_Config.CustomButton0.key = arrayToInt(array); break; case 1: - g_Config.CustomKey1.key = arrayToInt(array); + g_Config.CustomButton1.key = arrayToInt(array); break; case 2: - g_Config.CustomKey2.key = arrayToInt(array); + g_Config.CustomButton2.key = arrayToInt(array); break; case 3: - g_Config.CustomKey3.key = arrayToInt(array); + g_Config.CustomButton3.key = arrayToInt(array); break; case 4: - g_Config.CustomKey4.key = arrayToInt(array); + g_Config.CustomButton4.key = arrayToInt(array); break; case 5: - g_Config.CustomKey5.key = arrayToInt(array); + g_Config.CustomButton5.key = arrayToInt(array); break; case 6: - g_Config.CustomKey6.key = arrayToInt(array); + g_Config.CustomButton6.key = arrayToInt(array); break; case 7: - g_Config.CustomKey7.key = arrayToInt(array); + g_Config.CustomButton7.key = arrayToInt(array); break; case 8: - g_Config.CustomKey8.key = arrayToInt(array); + g_Config.CustomButton8.key = arrayToInt(array); break; case 9: - g_Config.CustomKey9.key = arrayToInt(array); + g_Config.CustomButton9.key = arrayToInt(array); break; } } diff --git a/UI/ComboKeyMappingScreen.h b/UI/CustomButtonMappingScreen.h similarity index 100% rename from UI/ComboKeyMappingScreen.h rename to UI/CustomButtonMappingScreen.h diff --git a/UI/GamepadEmu.cpp b/UI/GamepadEmu.cpp index e45b6a294f..446e8bd825 100644 --- a/UI/GamepadEmu.cpp +++ b/UI/GamepadEmu.cpp @@ -826,7 +826,7 @@ UI::ViewGroup *CreatePadLayout(float xres, float yres, bool *pause, bool showPau } return nullptr; }; - auto addComboKey = [=](const ConfigCustomButton& cfg, const char *key, const ConfigTouchPos &touch) -> CustomKey * { + auto addCustomButton = [=](const ConfigCustomButton& cfg, const char *key, const ConfigTouchPos &touch) -> CustomKey * { using namespace CustomKeyData; if (touch.show) { auto aux = root->Add(new CustomKey(cfg.key, key, cfg.toggle, cfg.repeat, controllMapper, @@ -885,16 +885,16 @@ UI::ViewGroup *CreatePadLayout(float xres, float yres, bool *pause, bool showPau root->Add(new PSPStick(stickBg, "Right analog stick", stickImage, ImageID("I_STICK"), 1, g_Config.touchRightAnalogStick.scale, buttonLayoutParams(g_Config.touchRightAnalogStick))); } - addComboKey(g_Config.CustomKey0, "Custom 1 button", g_Config.touchCustom0); - addComboKey(g_Config.CustomKey1, "Custom 2 button", g_Config.touchCustom1); - addComboKey(g_Config.CustomKey2, "Custom 3 button", g_Config.touchCustom2); - addComboKey(g_Config.CustomKey3, "Custom 4 button", g_Config.touchCustom3); - addComboKey(g_Config.CustomKey4, "Custom 5 button", g_Config.touchCustom4); - addComboKey(g_Config.CustomKey5, "Custom 6 button", g_Config.touchCustom5); - addComboKey(g_Config.CustomKey6, "Custom 7 button", g_Config.touchCustom6); - addComboKey(g_Config.CustomKey7, "Custom 8 button", g_Config.touchCustom7); - addComboKey(g_Config.CustomKey8, "Custom 9 button", g_Config.touchCustom8); - addComboKey(g_Config.CustomKey9, "Custom 10 button", g_Config.touchCustom9); + addCustomButton(g_Config.CustomButton0, "Custom 1 button", g_Config.touchCustom0); + addCustomButton(g_Config.CustomButton1, "Custom 2 button", g_Config.touchCustom1); + addCustomButton(g_Config.CustomButton2, "Custom 3 button", g_Config.touchCustom2); + addCustomButton(g_Config.CustomButton3, "Custom 4 button", g_Config.touchCustom3); + addCustomButton(g_Config.CustomButton4, "Custom 5 button", g_Config.touchCustom4); + addCustomButton(g_Config.CustomButton5, "Custom 6 button", g_Config.touchCustom5); + addCustomButton(g_Config.CustomButton6, "Custom 7 button", g_Config.touchCustom6); + addCustomButton(g_Config.CustomButton7, "Custom 8 button", g_Config.touchCustom7); + addCustomButton(g_Config.CustomButton8, "Custom 9 button", g_Config.touchCustom8); + addCustomButton(g_Config.CustomButton9, "Custom 10 button", g_Config.touchCustom9); if (g_Config.bGestureControlEnabled) root->Add(new GestureGamepad(controllMapper)); diff --git a/UI/TouchControlLayoutScreen.cpp b/UI/TouchControlLayoutScreen.cpp index 2adbf67234..b478c2f5e4 100644 --- a/UI/TouchControlLayoutScreen.cpp +++ b/UI/TouchControlLayoutScreen.cpp @@ -520,16 +520,16 @@ void ControlLayoutView::CreateViews() { } return b; }; - addDragCustomKey(g_Config.touchCustom0, "Custom 1 button", g_Config.CustomKey0); - addDragCustomKey(g_Config.touchCustom1, "Custom 2 button", g_Config.CustomKey1); - addDragCustomKey(g_Config.touchCustom2, "Custom 3 button", g_Config.CustomKey2); - addDragCustomKey(g_Config.touchCustom3, "Custom 4 button", g_Config.CustomKey3); - addDragCustomKey(g_Config.touchCustom4, "Custom 5 button", g_Config.CustomKey4); - addDragCustomKey(g_Config.touchCustom5, "Custom 6 button", g_Config.CustomKey5); - addDragCustomKey(g_Config.touchCustom6, "Custom 7 button", g_Config.CustomKey6); - addDragCustomKey(g_Config.touchCustom7, "Custom 8 button", g_Config.CustomKey7); - addDragCustomKey(g_Config.touchCustom8, "Custom 9 button", g_Config.CustomKey8); - addDragCustomKey(g_Config.touchCustom9, "Custom 10 button", g_Config.CustomKey9); + addDragCustomKey(g_Config.touchCustom0, "Custom 1 button", g_Config.CustomButton0); + addDragCustomKey(g_Config.touchCustom1, "Custom 2 button", g_Config.CustomButton1); + addDragCustomKey(g_Config.touchCustom2, "Custom 3 button", g_Config.CustomButton2); + addDragCustomKey(g_Config.touchCustom3, "Custom 4 button", g_Config.CustomButton3); + addDragCustomKey(g_Config.touchCustom4, "Custom 5 button", g_Config.CustomButton4); + addDragCustomKey(g_Config.touchCustom5, "Custom 6 button", g_Config.CustomButton5); + addDragCustomKey(g_Config.touchCustom6, "Custom 7 button", g_Config.CustomButton6); + addDragCustomKey(g_Config.touchCustom7, "Custom 8 button", g_Config.CustomButton7); + addDragCustomKey(g_Config.touchCustom8, "Custom 9 button", g_Config.CustomButton8); + addDragCustomKey(g_Config.touchCustom9, "Custom 10 button", g_Config.CustomButton9); for (size_t i = 0; i < controls_.size(); i++) { Add(controls_[i]); diff --git a/UI/TouchControlVisibilityScreen.cpp b/UI/TouchControlVisibilityScreen.cpp index a7d414fb85..7144cd26d0 100644 --- a/UI/TouchControlVisibilityScreen.cpp +++ b/UI/TouchControlVisibilityScreen.cpp @@ -16,11 +16,12 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include "Common/Render/TextureAtlas.h" - -#include "TouchControlVisibilityScreen.h" -#include "Core/Config.h" #include "Common/Data/Text/I18n.h" -#include "ComboKeyMappingScreen.h" + +#include "Core/Config.h" + +#include "UI/TouchControlVisibilityScreen.h" +#include "UI/CustomButtonMappingScreen.h" static const int leftColumnWidth = 140; diff --git a/UI/UI.vcxproj b/UI/UI.vcxproj index 5c791f0512..3f84967c37 100644 --- a/UI/UI.vcxproj +++ b/UI/UI.vcxproj @@ -37,8 +37,8 @@ - + @@ -72,8 +72,8 @@ - + diff --git a/UI/UI.vcxproj.filters b/UI/UI.vcxproj.filters index 1d014a2f76..120b04c9d3 100644 --- a/UI/UI.vcxproj.filters +++ b/UI/UI.vcxproj.filters @@ -53,9 +53,6 @@ Screens - - Screens - Screens @@ -83,6 +80,9 @@ Views + + Screens + @@ -136,9 +136,6 @@ Screens - - Screens - Screens @@ -166,6 +163,9 @@ Views + + Screens + diff --git a/UWP/UI_UWP/UI_UWP.vcxproj b/UWP/UI_UWP/UI_UWP.vcxproj index 008e6f6c64..efeec8df14 100644 --- a/UWP/UI_UWP/UI_UWP.vcxproj +++ b/UWP/UI_UWP/UI_UWP.vcxproj @@ -268,8 +268,8 @@ - + @@ -303,8 +303,8 @@ - + diff --git a/UWP/UI_UWP/UI_UWP.vcxproj.filters b/UWP/UI_UWP/UI_UWP.vcxproj.filters index 355adc195f..56716f7b53 100644 --- a/UWP/UI_UWP/UI_UWP.vcxproj.filters +++ b/UWP/UI_UWP/UI_UWP.vcxproj.filters @@ -3,7 +3,6 @@ - @@ -34,12 +33,12 @@ + - @@ -69,5 +68,6 @@ + \ No newline at end of file diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 23f1f5220b..05ba84597a 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -745,7 +745,7 @@ LOCAL_SRC_FILES := \ $(SRC)/UI/ProfilerDraw.cpp \ $(SRC)/UI/NativeApp.cpp \ $(SRC)/UI/Theme.cpp \ - $(SRC)/UI/ComboKeyMappingScreen.cpp + $(SRC)/UI/CustomButtonMappingScreen.cpp ifneq ($(SKIPAPP),1) include $(BUILD_SHARED_LIBRARY)