From 14edd2154163751b8ba03dd0152085b55a6b8e63 Mon Sep 17 00:00:00 2001 From: oddMLan Date: Mon, 6 Apr 2020 06:27:28 -0700 Subject: [PATCH] GLideNUI-wtl: Match Qt GUI 1:1 Based on commit c168f53d1206b9a246763930ccdf29a1ac75c677 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 --- src/GLideNUI-wtl/ConfigDlg.cpp | 2 +- src/GLideNUI-wtl/GLideNUI.rc | Bin 48634 -> 51378 bytes src/GLideNUI-wtl/config-emulation.cpp | 6 +++--- src/GLideNUI-wtl/config-framebuffer.cpp | 4 +++- src/GLideNUI-wtl/config-texture.cpp | 4 ++-- src/GLideNUI-wtl/config-video.cpp | 6 ++++-- src/GLideNUI-wtl/config-video.h | 1 + src/GLideNUI-wtl/resource.h | Bin 15582 -> 17146 bytes 8 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/GLideNUI-wtl/ConfigDlg.cpp b/src/GLideNUI-wtl/ConfigDlg.cpp index 0c0974cc..ab74c364 100644 --- a/src/GLideNUI-wtl/ConfigDlg.cpp +++ b/src/GLideNUI-wtl/ConfigDlg.cpp @@ -118,7 +118,7 @@ void CConfigDlg::OnCustomSettingsToggled(bool checked) Rect.right -= Move; UseProfile.MoveWindow(&Rect); } - uint32_t Left = Rect.right + 7; + uint32_t Left = Rect.right + 2; CWindow ProfileStatic = GetDlgItem(IDC_SETTINGS_PROFILE_STATIC); ProfileStatic.GetWindowRect(&Rect); diff --git a/src/GLideNUI-wtl/GLideNUI.rc b/src/GLideNUI-wtl/GLideNUI.rc index dacb6d9a0f513cfadbef88538dbc399cb038616e..f811aad826b34941b461a37cf88caf0b293cae4f 100644 GIT binary patch delta 5301 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 I(Cg{{1BNV|2mk;8 delta 4460 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 aB^k?NpLwyHU%}V>4H<@lY<^wuwSNGyn}2Ws delta 35 qcmey>%6PAGLx~lm@#cvR`izsOn2SxG;3P8nm1EyzF)IlmI|~2{Uk)Jv