From 409edfd5e7898d9db07ec762e3ce8c0026a55c32 Mon Sep 17 00:00:00 2001 From: Steven Cherry Date: Tue, 14 May 2013 18:55:57 -0500 Subject: [PATCH] Set 'F3' on keyboard to toggle, in addition to left thumb stick (for keyboard users) Fix graphics screen 'Fps Limit' from being unable to close out, making options below it unreadable. --- UI/MenuScreens.cpp | 4 ++-- Windows/KeyboardDevice.cpp | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/UI/MenuScreens.cpp b/UI/MenuScreens.cpp index 6e4f7393df..4fa58d67e7 100644 --- a/UI/MenuScreens.cpp +++ b/UI/MenuScreens.cpp @@ -723,7 +723,7 @@ void GraphicsScreenP2::render() { I18NCategory *g = GetI18NCategory("General"); I18NCategory *gs = GetI18NCategory("Graphics"); - ui_draw2d.SetFontScale(1.5f, 1.5f); + ui_draw2d.SetFontScale(1.0f, 1.0f); ui_draw2d.DrawText(UBUNTU24, gs->T("Graphics Settings"), dp_xres / 2, 20, 0xFFFFFFFF, ALIGN_HCENTER); ui_draw2d.SetFontScale(1.0f, 1.0f); @@ -782,7 +782,7 @@ void GraphicsScreenP2::render() { if (UIButton(GEN_ID, hlinear1, 45, 0, "240", ALIGN_LEFT)) g_Config.iFpsLimit = 240; } else { - g_Config.iFpsLimit = 60; + g_Config.iFpsLimit = 0; } bool TexScaling = g_Config.iTexScalingLevel > 1; UICheckBox(GEN_ID, x, y += stride + 15, gs->T("xBRZ Texture Scaling"), ALIGN_TOPLEFT, &TexScaling); diff --git a/Windows/KeyboardDevice.cpp b/Windows/KeyboardDevice.cpp index 297f985ce2..9d72541a46 100644 --- a/Windows/KeyboardDevice.cpp +++ b/Windows/KeyboardDevice.cpp @@ -19,6 +19,7 @@ unsigned int key_pad_map[] = { VK_DOWN, PAD_BUTTON_DOWN, VK_LEFT, PAD_BUTTON_LEFT, VK_RIGHT, PAD_BUTTON_RIGHT, + VK_F3, PAD_BUTTON_LEFT_THUMB, }; unsigned short analog_ctrl_map[] = {