From ecc37c4d1f3ecb71e22ba93ffd241eba99d2ed28 Mon Sep 17 00:00:00 2001 From: lightningterror <18107717+lightningterror@users.noreply.github.com> Date: Fri, 6 Nov 2020 21:49:37 +0100 Subject: [PATCH] gsdx: Remove TV Shader hotkey toggle (F7). Plenty of users misclick this setting and don't know how to switch back since it's a rarely used option. Let's get rid of the hotkey toggle for a quality of life change. --- plugins/GSdx/GSdx.rc | 2 +- plugins/GSdx/Renderers/Common/GSRenderer.cpp | 6 ------ plugins/GSdx/Window/GSLinuxDialog.cpp | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/plugins/GSdx/GSdx.rc b/plugins/GSdx/GSdx.rc index 0e34829276..f033f4a13d 100644 --- a/plugins/GSdx/GSdx.rc +++ b/plugins/GSdx/GSdx.rc @@ -191,7 +191,7 @@ BEGIN PUSHBUTTON "Browse",IDC_SHADER_FX_CONF_BUTTON,196,164,37,14 EDITTEXT IDC_SHADER_FX_CONF_EDIT,16,164,170,14,ES_AUTOHSCROLL COMBOBOX IDC_TVSHADER,75,184,98,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "TV Shader (F7):",IDC_STATIC,16,186,55,8 + LTEXT "TV Shader:",IDC_STATIC,16,186,55,8 DEFPUSHBUTTON "OK",IDOK,71,208,50,14 DEFPUSHBUTTON "Cancel",IDCANCEL,127,208,50,14 END diff --git a/plugins/GSdx/Renderers/Common/GSRenderer.cpp b/plugins/GSdx/Renderers/Common/GSRenderer.cpp index 52472e6781..156b652671 100644 --- a/plugins/GSdx/Renderers/Common/GSRenderer.cpp +++ b/plugins/GSdx/Renderers/Common/GSRenderer.cpp @@ -573,7 +573,6 @@ void GSRenderer::KeyEvent(GSKeyEventData* e) #if defined(__unix__) #define VK_F5 XK_F5 #define VK_F6 XK_F6 -#define VK_F7 XK_F7 #define VK_DELETE XK_Delete #define VK_INSERT XK_Insert #define VK_PRIOR XK_Prior @@ -592,11 +591,6 @@ void GSRenderer::KeyEvent(GSKeyEventData* e) if( m_wnd->IsManaged() ) m_aspectratio = (m_aspectratio + s_aspect_ratio_nb + step) % s_aspect_ratio_nb; return; - case VK_F7: - m_shader = (m_shader + s_post_shader_nb + step) % s_post_shader_nb; - theApp.SetConfig("TVShader", m_shader); - printf("GSdx: Set shader to: %d.\n", m_shader); - return; case VK_DELETE: m_aa1 = !m_aa1; theApp.SetConfig("aa1", m_aa1); diff --git a/plugins/GSdx/Window/GSLinuxDialog.cpp b/plugins/GSdx/Window/GSLinuxDialog.cpp index a1020046d6..85795eec99 100644 --- a/plugins/GSdx/Window/GSLinuxDialog.cpp +++ b/plugins/GSdx/Window/GSLinuxDialog.cpp @@ -368,7 +368,7 @@ void populate_shader_table(GtkWidget* shader_table) GtkWidget* fxaa_check = CreateCheckBox("Fxaa Shader (PgUp)", "fxaa"); GtkWidget* shaderfx_check = CreateCheckBox("External Shader (Home)", "shaderfx"); - GtkWidget* tv_shader_label = left_label("TV Shader (F7):"); + GtkWidget* tv_shader_label = left_label("TV Shader:"); GtkWidget* tv_shader = CreateComboBoxFromVector(theApp.m_gs_tv_shaders, "TVShader"); GtkWidget* linear_check = CreateCheckBox("Texture Filtering of Display", "linear_present");