mirror of
https://github.com/blawar/GLideN64.git
synced 2024-07-04 10:03:36 +00:00
GLideNUI-wtl: Match Qt GUI 1:1
Based on commit c168f53d12
With some minor improvements/differences over Qt GUI
- Fully DPI aware
- Dithering is in the Video tab instead of Emulation, some wording differences
Observations:
- "Windowed resolution" is an editable combobox now. Need to parse custom resolution as well suggest some default ones
- "Enable noise" has been removed since it's permanently enabled in latest master
- Need to sync with upstream to connect the Dithering stuff with the config system
- Warning under Antialiasing section needs to hide if N64-depth compare is disabled, but might be difficult to do
Further suggestions:
- "Save" button should be an "Apply" button that applies the settings to current game without pausing. Might be out of the scope of this refactor though.
- Need to test GUI in Windows XP, Windows Vista/7/8.1 to make sure nothing looks out of place
This commit is contained in:
parent
66175d82de
commit
14edd21541
|
@ -118,7 +118,7 @@ void CConfigDlg::OnCustomSettingsToggled(bool checked)
|
||||||
Rect.right -= Move;
|
Rect.right -= Move;
|
||||||
UseProfile.MoveWindow(&Rect);
|
UseProfile.MoveWindow(&Rect);
|
||||||
}
|
}
|
||||||
uint32_t Left = Rect.right + 7;
|
uint32_t Left = Rect.right + 2;
|
||||||
|
|
||||||
CWindow ProfileStatic = GetDlgItem(IDC_SETTINGS_PROFILE_STATIC);
|
CWindow ProfileStatic = GetDlgItem(IDC_SETTINGS_PROFILE_STATIC);
|
||||||
ProfileStatic.GetWindowRect(&Rect);
|
ProfileStatic.GetWindowRect(&Rect);
|
||||||
|
|
Binary file not shown.
|
@ -32,8 +32,10 @@ BOOL CEmulationTab::OnInitDialog(CWindow /*wndFocus*/, LPARAM /*lInitParam*/)
|
||||||
m_N64ResMultiplerSpin.SetPos(2);
|
m_N64ResMultiplerSpin.SetPos(2);
|
||||||
m_N64ResMultiplerSpin.SetBuddy(m_N64ResMultiplerTxt);
|
m_N64ResMultiplerSpin.SetBuddy(m_N64ResMultiplerTxt);
|
||||||
|
|
||||||
|
SIZE iconSz = { ::GetSystemMetrics(SM_CXSMICON), ::GetSystemMetrics(SM_CYSMICON) };
|
||||||
m_GammaIcon.SubclassWindow(GetDlgItem(IDC_GAMMA_ICON));
|
m_GammaIcon.SubclassWindow(GetDlgItem(IDC_GAMMA_ICON));
|
||||||
m_GammaIcon.SetIcon(MAKEINTRESOURCE(IDI_ICON_INFO), 16, 16);
|
m_GammaIcon.SetIcon(MAKEINTRESOURCE(IDI_ICON_INFO), iconSz.cx, iconSz.cy);
|
||||||
|
m_GammaIcon.SetWindowPos(HWND_TOP, 0, 0, iconSz.cx, iconSz.cy, SWP_NOMOVE | SWP_NOZORDER);
|
||||||
m_GammaIcon.SetBackroundBrush((HBRUSH)GetStockObject(WHITE_BRUSH));
|
m_GammaIcon.SetBackroundBrush((HBRUSH)GetStockObject(WHITE_BRUSH));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -71,7 +73,6 @@ void CEmulationTab::LoadSettings(bool blockCustomSettings)
|
||||||
m_Dlg.OnCustomSettingsToggled(config.generalEmulation.enableCustomSettings != 0);
|
m_Dlg.OnCustomSettingsToggled(config.generalEmulation.enableCustomSettings != 0);
|
||||||
}
|
}
|
||||||
CButton(GetDlgItem(IDC_CHK_N64_STYLE_MIP_MAPPING)).SetCheck(config.generalEmulation.enableLOD != 0 ? BST_CHECKED : BST_UNCHECKED);
|
CButton(GetDlgItem(IDC_CHK_N64_STYLE_MIP_MAPPING)).SetCheck(config.generalEmulation.enableLOD != 0 ? BST_CHECKED : BST_UNCHECKED);
|
||||||
CButton(GetDlgItem(IDC_CHK_NOISE)).SetCheck(config.generalEmulation.enableNoise != 0 ? BST_CHECKED : BST_UNCHECKED);
|
|
||||||
CButton(GetDlgItem(IDC_CHK_HWLIGHTING)).SetCheck(config.generalEmulation.enableHWLighting != 0 ? BST_CHECKED : BST_UNCHECKED);
|
CButton(GetDlgItem(IDC_CHK_HWLIGHTING)).SetCheck(config.generalEmulation.enableHWLighting != 0 ? BST_CHECKED : BST_UNCHECKED);
|
||||||
CButton(GetDlgItem(IDC_CHK_SHADERS_STORAGE)).SetCheck(config.generalEmulation.enableShadersStorage != 0 ? BST_CHECKED : BST_UNCHECKED);
|
CButton(GetDlgItem(IDC_CHK_SHADERS_STORAGE)).SetCheck(config.generalEmulation.enableShadersStorage != 0 ? BST_CHECKED : BST_UNCHECKED);
|
||||||
|
|
||||||
|
@ -104,7 +105,6 @@ void CEmulationTab::SaveSettings()
|
||||||
{
|
{
|
||||||
config.generalEmulation.enableCustomSettings = CButton(GetDlgItem(IDC_CHK_USE_PER_GAME)).GetCheck() == BST_CHECKED ? 1 : 0;
|
config.generalEmulation.enableCustomSettings = CButton(GetDlgItem(IDC_CHK_USE_PER_GAME)).GetCheck() == BST_CHECKED ? 1 : 0;
|
||||||
config.generalEmulation.enableLOD = CButton(GetDlgItem(IDC_CHK_N64_STYLE_MIP_MAPPING)).GetCheck() == BST_CHECKED ? 1 : 0;
|
config.generalEmulation.enableLOD = CButton(GetDlgItem(IDC_CHK_N64_STYLE_MIP_MAPPING)).GetCheck() == BST_CHECKED ? 1 : 0;
|
||||||
config.generalEmulation.enableNoise = CButton(GetDlgItem(IDC_CHK_NOISE)).GetCheck() == BST_CHECKED ? 1 : 0;
|
|
||||||
config.generalEmulation.enableHWLighting = CButton(GetDlgItem(IDC_CHK_HWLIGHTING)).GetCheck() == BST_CHECKED ? 1 : 0;
|
config.generalEmulation.enableHWLighting = CButton(GetDlgItem(IDC_CHK_HWLIGHTING)).GetCheck() == BST_CHECKED ? 1 : 0;
|
||||||
config.generalEmulation.enableShadersStorage = CButton(GetDlgItem(IDC_CHK_SHADERS_STORAGE)).GetCheck() == BST_CHECKED ? 1 : 0;
|
config.generalEmulation.enableShadersStorage = CButton(GetDlgItem(IDC_CHK_SHADERS_STORAGE)).GetCheck() == BST_CHECKED ? 1 : 0;
|
||||||
|
|
||||||
|
|
|
@ -9,8 +9,10 @@ CFrameBufferTab::CFrameBufferTab() :
|
||||||
|
|
||||||
BOOL CFrameBufferTab::OnInitDialog(CWindow /*wndFocus*/, LPARAM /*lInitParam*/)
|
BOOL CFrameBufferTab::OnInitDialog(CWindow /*wndFocus*/, LPARAM /*lInitParam*/)
|
||||||
{
|
{
|
||||||
|
SIZE iconSz = { ::GetSystemMetrics(SM_CXICON), ::GetSystemMetrics(SM_CYICON) };
|
||||||
m_EmulateFBIcon.SubclassWindow(GetDlgItem(IDC_EMULATE_FB_ICON));
|
m_EmulateFBIcon.SubclassWindow(GetDlgItem(IDC_EMULATE_FB_ICON));
|
||||||
m_EmulateFBIcon.SetIcon(MAKEINTRESOURCE(IDI_ICON_WARNING), 16, 16);
|
m_EmulateFBIcon.SetIcon(MAKEINTRESOURCE(IDI_ICON_WARNING), iconSz.cx, iconSz.cy);
|
||||||
|
m_EmulateFBIcon.SetWindowPos(HWND_TOP, 0, 0, iconSz.cx, iconSz.cy, SWP_NOMOVE | SWP_NOZORDER);
|
||||||
m_EmulateFBIcon.SetBackroundBrush((HBRUSH)GetStockObject(WHITE_BRUSH));
|
m_EmulateFBIcon.SetBackroundBrush((HBRUSH)GetStockObject(WHITE_BRUSH));
|
||||||
|
|
||||||
CComboBox frameBufferSwapComboBox(GetDlgItem(IDC_CMB_FRAMEBUFFER_SWAP));
|
CComboBox frameBufferSwapComboBox(GetDlgItem(IDC_CMB_FRAMEBUFFER_SWAP));
|
||||||
|
|
|
@ -84,11 +84,11 @@ LRESULT CTextureEnhancementTab::OnScroll(UINT /*uMsg*/, WPARAM /*wParam*/, LPARA
|
||||||
int Pos = m_TextureFilterCacheSpin.GetPos();
|
int Pos = m_TextureFilterCacheSpin.GetPos();
|
||||||
if (Pos == 20)
|
if (Pos == 20)
|
||||||
{
|
{
|
||||||
m_TextureFilterCacheTxt.SetWindowText(L"999 mb");
|
m_TextureFilterCacheTxt.SetWindowText(L"999 MB");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m_TextureFilterCacheTxt.SetWindowText(FormatStrW(L"%d mb", Pos * 50).c_str());
|
m_TextureFilterCacheTxt.SetWindowText(FormatStrW(L"%d MB", Pos * 50).c_str());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -53,7 +53,7 @@ BOOL CVideoTab::OnInitDialog(CWindow /*wndFocus*/, LPARAM /*lInitParam*/)
|
||||||
m_AliasingSlider.SetRangeMax(3);
|
m_AliasingSlider.SetRangeMax(3);
|
||||||
|
|
||||||
m_AnisotropicSlider.Attach(GetDlgItem(IDC_ANISOTROPIC_SLIDER));
|
m_AnisotropicSlider.Attach(GetDlgItem(IDC_ANISOTROPIC_SLIDER));
|
||||||
m_AnisotropicSlider.SetTicFreq(1);
|
m_AnisotropicSlider.SetTicFreq(2);
|
||||||
m_AnisotropicSlider.SetRangeMin(0);
|
m_AnisotropicSlider.SetRangeMin(0);
|
||||||
m_AnisotropicSlider.SetRangeMax(16);
|
m_AnisotropicSlider.SetRangeMax(16);
|
||||||
|
|
||||||
|
@ -63,8 +63,10 @@ BOOL CVideoTab::OnInitDialog(CWindow /*wndFocus*/, LPARAM /*lInitParam*/)
|
||||||
aspectComboBox.AddString(L"Stretch");
|
aspectComboBox.AddString(L"Stretch");
|
||||||
aspectComboBox.AddString(L"Try to adjust game to fit");
|
aspectComboBox.AddString(L"Try to adjust game to fit");
|
||||||
|
|
||||||
|
SIZE iconSz = { ::GetSystemMetrics(SM_CXSMICON), ::GetSystemMetrics(SM_CYSMICON) };
|
||||||
m_AAInfoIcon.SubclassWindow(GetDlgItem(IDC_AA_INFO_ICON));
|
m_AAInfoIcon.SubclassWindow(GetDlgItem(IDC_AA_INFO_ICON));
|
||||||
m_AAInfoIcon.SetIcon(MAKEINTRESOURCE(IDI_ICON_INFO), 16, 16);
|
m_AAInfoIcon.SetIcon(MAKEINTRESOURCE(IDI_ICON_INFO), iconSz.cx, iconSz.cy);
|
||||||
|
m_AAInfoIcon.SetWindowPos(HWND_TOP, 0, 0, iconSz.cx, iconSz.cy, SWP_NOMOVE | SWP_NOZORDER);
|
||||||
m_AAInfoIcon.SetBackroundBrush((HBRUSH)GetStockObject(WHITE_BRUSH));
|
m_AAInfoIcon.SetBackroundBrush((HBRUSH)GetStockObject(WHITE_BRUSH));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,6 +13,7 @@ public:
|
||||||
MSG_WM_INITDIALOG(OnInitDialog)
|
MSG_WM_INITDIALOG(OnInitDialog)
|
||||||
MESSAGE_HANDLER(WM_CTLCOLORDLG, OnColorStatic)
|
MESSAGE_HANDLER(WM_CTLCOLORDLG, OnColorStatic)
|
||||||
MESSAGE_HANDLER(WM_CTLCOLORSTATIC, OnColorStatic)
|
MESSAGE_HANDLER(WM_CTLCOLORSTATIC, OnColorStatic)
|
||||||
|
MESSAGE_HANDLER(WM_PRINTCLIENT, OnColorStatic)
|
||||||
NOTIFY_HANDLER_EX(IDC_TAB_OVERSCAN, TCN_SELCHANGE, OnOverscanTabChange)
|
NOTIFY_HANDLER_EX(IDC_TAB_OVERSCAN, TCN_SELCHANGE, OnOverscanTabChange)
|
||||||
COMMAND_HANDLER_EX(IDC_CMB_FULL_SCREEN_RES, CBN_SELCHANGE, OnFullScreenChanged)
|
COMMAND_HANDLER_EX(IDC_CMB_FULL_SCREEN_RES, CBN_SELCHANGE, OnFullScreenChanged)
|
||||||
COMMAND_HANDLER_EX(IDC_CHK_OVERSCAN, BN_CLICKED, OnOverscan)
|
COMMAND_HANDLER_EX(IDC_CHK_OVERSCAN, BN_CLICKED, OnOverscan)
|
||||||
|
|
Binary file not shown.
Loading…
Reference in New Issue
Block a user