ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GSDX: Add missing grayouts to Shadeboost options 

The shadeboost options text (Contrast, Brightness, Saturation) were not
grayed out when shadeboost was disabled, it was sort of inconsistent
compared to the behavior of external shader, so added grayouts to them
when shadeboost is disabled.

Also changed "OpenGL Very Advanced Custom Settings" to "OpenGL Advanced
Settings", the verbosity didn't help much in my opinion.
This commit is contained in:
Akash 2017-05-06 22:11:00 +05:30 committed by Jonathan Li
parent ecd7107ccb
commit 5f449151a1
3 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/GSdx/GSSettingsDlg.cpp
View File

@ -496,11 +496,11 @@ void GSShaderDlg::UpdateControls()
char text[8] = {0}; char text[8] = {0};
sprintf(text, "%d", m_saturation); sprintf(text, "%d", m_saturation);
SetDlgItemText(m_hWnd, IDC_SATURATION_TEXT, text); SetDlgItemText(m_hWnd, IDC_SATURATION_VALUE, text);
sprintf(text, "%d", m_brightness); sprintf(text, "%d", m_brightness);
SetDlgItemText(m_hWnd, IDC_BRIGHTNESS_TEXT, text); SetDlgItemText(m_hWnd, IDC_BRIGHTNESS_VALUE, text);
sprintf(text, "%d", m_contrast); sprintf(text, "%d", m_contrast);
SetDlgItemText(m_hWnd, IDC_CONTRAST_TEXT, text); SetDlgItemText(m_hWnd, IDC_CONTRAST_VALUE, text);
// Shader Settings // Shader Settings
bool external_shader_selected = IsDlgButtonChecked(m_hWnd, IDC_SHADER_FX) == BST_CHECKED; bool external_shader_selected = IsDlgButtonChecked(m_hWnd, IDC_SHADER_FX) == BST_CHECKED;
@ -511,6 +511,9 @@ void GSShaderDlg::UpdateControls()
EnableWindow(GetDlgItem(m_hWnd, IDC_SATURATION_TEXT), shadeboost_selected); EnableWindow(GetDlgItem(m_hWnd, IDC_SATURATION_TEXT), shadeboost_selected);
EnableWindow(GetDlgItem(m_hWnd, IDC_BRIGHTNESS_TEXT), shadeboost_selected); EnableWindow(GetDlgItem(m_hWnd, IDC_BRIGHTNESS_TEXT), shadeboost_selected);
EnableWindow(GetDlgItem(m_hWnd, IDC_CONTRAST_TEXT), shadeboost_selected); EnableWindow(GetDlgItem(m_hWnd, IDC_CONTRAST_TEXT), shadeboost_selected);
EnableWindow(GetDlgItem(m_hWnd, IDC_SATURATION_VALUE), shadeboost_selected);
EnableWindow(GetDlgItem(m_hWnd, IDC_BRIGHTNESS_VALUE), shadeboost_selected);
EnableWindow(GetDlgItem(m_hWnd, IDC_CONTRAST_VALUE), shadeboost_selected);
EnableWindow(GetDlgItem(m_hWnd, IDC_SHADER_FX_TEXT), external_shader_selected); EnableWindow(GetDlgItem(m_hWnd, IDC_SHADER_FX_TEXT), external_shader_selected);
EnableWindow(GetDlgItem(m_hWnd, IDC_SHADER_FX_EDIT), external_shader_selected); EnableWindow(GetDlgItem(m_hWnd, IDC_SHADER_FX_EDIT), external_shader_selected);
EnableWindow(GetDlgItem(m_hWnd, IDC_SHADER_FX_BUTTON), external_shader_selected); EnableWindow(GetDlgItem(m_hWnd, IDC_SHADER_FX_BUTTON), external_shader_selected);

14
plugins/GSdx/GSdx.rc
View File

@ -162,7 +162,7 @@ BEGIN
EDITTEXT IDC_TCOFFSETY2,80,201,116,14,ES_RIGHT | ES_AUTOHSCROLL EDITTEXT IDC_TCOFFSETY2,80,201,116,14,ES_RIGHT | ES_AUTOHSCROLL
CONTROL "",IDC_TCOFFSETY,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,127,199,11,14 CONTROL "",IDC_TCOFFSETY,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,127,199,11,14
// OpenGL Advanced Settings: // OpenGL Advanced Settings:
GROUPBOX "OpenGL Very Advanced Custom Settings",IDC_STATIC,7,225,196,48,0,WS_EX_TRANSPARENT GROUPBOX "OpenGL Advanced Settings",IDC_STATIC,7,225,196,48,0,WS_EX_TRANSPARENT
RTEXT "Geometry Shader:",IDC_GEOMETRY_SHADER_TEXT,14,240,62,8 RTEXT "Geometry Shader:",IDC_GEOMETRY_SHADER_TEXT,14,240,62,8
COMBOBOX IDC_GEOMETRY_SHADER_OVERRIDE,80,237,97,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_GEOMETRY_SHADER_OVERRIDE,80,237,97,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
RTEXT "Image Load Store:",IDC_IMAGE_LOAD_STORE_TEXT,14,255,62,8 RTEXT "Image Load Store:",IDC_IMAGE_LOAD_STORE_TEXT,14,255,62,8
@ -180,15 +180,15 @@ BEGIN
CONTROL "Texture Filtering of Display",IDC_LINEAR_PRESENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,6,100,10 CONTROL "Texture Filtering of Display",IDC_LINEAR_PRESENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,6,100,10
CONTROL "FXAA Shader",IDC_FXAA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,19,54,10 CONTROL "FXAA Shader",IDC_FXAA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,19,54,10
CONTROL "Shade Boost",IDC_SHADEBOOST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,32,90,10 CONTROL "Shade Boost",IDC_SHADEBOOST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,32,90,10
LTEXT "Shade Boost Brightness",IDC_STATIC,16,50,80,8 LTEXT "Shade Boost Brightness",IDC_BRIGHTNESS_TEXT,16,50,80,8
CONTROL "",IDC_BRIGHTNESS_SLIDER,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,95,48,135,15 CONTROL "",IDC_BRIGHTNESS_SLIDER,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,95,48,135,15
RTEXT "100",IDC_BRIGHTNESS_TEXT,225,50,15,8 RTEXT "100",IDC_BRIGHTNESS_VALUE,225,50,15,8
LTEXT "Shade Boost Contrast",IDC_STATIC,16,75,80,8 LTEXT "Shade Boost Contrast",IDC_CONTRAST_TEXT,16,75,80,8
CONTROL "",IDC_CONTRAST_SLIDER,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,95,73,135,15 CONTROL "",IDC_CONTRAST_SLIDER,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,95,73,135,15
RTEXT "100",IDC_CONTRAST_TEXT,225,75,15,8 RTEXT "100",IDC_CONTRAST_VALUE,225,75,15,8
LTEXT "Shade Boost Saturation",IDC_STATIC,16,100,80,8 LTEXT "Shade Boost Saturation",IDC_SATURATION_TEXT,16,100,80,8
CONTROL "",IDC_SATURATION_SLIDER,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,95,98,135,15 CONTROL "",IDC_SATURATION_SLIDER,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,95,98,135,15
RTEXT "100",IDC_SATURATION_TEXT,225,100,15,8 RTEXT "100",IDC_SATURATION_VALUE,225,100,15,8
CONTROL "External Shader",IDC_SHADER_FX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,116,90,10 CONTROL "External Shader",IDC_SHADER_FX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,116,90,10
LTEXT "External Shader",IDC_SHADER_FX_TEXT,16,131,75,8 LTEXT "External Shader",IDC_SHADER_FX_TEXT,16,131,75,8
EDITTEXT IDC_SHADER_FX_EDIT,16,139,170,14,ES_AUTOHSCROLL EDITTEXT IDC_SHADER_FX_EDIT,16,139,170,14,ES_AUTOHSCROLL

23
plugins/GSdx/resource.h
View File

@ -112,15 +112,18 @@
#define IDC_SATURATION_TEXT 2145 #define IDC_SATURATION_TEXT 2145
#define IDC_BRIGHTNESS_TEXT 2146 #define IDC_BRIGHTNESS_TEXT 2146
#define IDC_CONTRAST_TEXT 2147 #define IDC_CONTRAST_TEXT 2147
#define IDC_SHADER_FX 2148 #define IDC_SATURATION_VALUE 2148
#define IDC_SHADER_FX_EDIT 2149 #define IDC_CONTRAST_VALUE 2149
#define IDC_SHADER_FX_CONF_EDIT 2150 #define IDC_BRIGHTNESS_VALUE 2150
#define IDC_SHADER_FX_BUTTON 2151 #define IDC_SHADER_FX 2151
#define IDC_SHADER_FX_CONF_BUTTON 2152 #define IDC_SHADER_FX_EDIT 2152
#define IDC_SHADER_FX_TEXT 2153 #define IDC_SHADER_FX_CONF_EDIT 2153
#define IDC_SHADER_FX_CONF_TEXT 2154 #define IDC_SHADER_FX_BUTTON 2154
#define IDC_TVSHADER 2155 #define IDC_SHADER_FX_CONF_BUTTON 2155
#define IDC_LINEAR_PRESENT 2156 #define IDC_SHADER_FX_TEXT 2156
#define IDC_SHADER_FX_CONF_TEXT 2157
#define IDC_TVSHADER 2158
#define IDC_LINEAR_PRESENT 2159
// OSD: // OSD:
#define IDC_OSD_LOG 2170 #define IDC_OSD_LOG 2170
#define IDC_OSD_MONITOR 2171 #define IDC_OSD_MONITOR 2171
@ -164,7 +167,7 @@
// //
#ifdef APSTUDIO_INVOKED #ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS #ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 10013 #define _APS_NEXT_RESOURCE_VALUE 10018
#define _APS_NEXT_COMMAND_VALUE 32771 #define _APS_NEXT_COMMAND_VALUE 32771
#define _APS_NEXT_CONTROL_VALUE 2194 #define _APS_NEXT_CONTROL_VALUE 2194
#define _APS_NEXT_SYMED_VALUE 5000 #define _APS_NEXT_SYMED_VALUE 5000