summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp
diff options
context:
space:
mode:
authorEmptyChaos <EmptyChaos@users.noreply.github.com>2016-08-02 06:22:58 +0000
committerEmptyChaos <EmptyChaos@users.noreply.github.com>2016-10-04 13:47:22 +1100
commitef0d21299ab5b62158927f0cab799f33f33c2bea (patch)
tree3c7d38bc4447cd141107f1f67ac000a34573dc46 /Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp
parent2dfd04d7a57e309fe3343e207448020a650c2745 (diff)
WX: HiDPI: VideoConfigDiag
Resolved "TODO" for Texture Cache safety, added explanation message. Resolved "TODO" for default description, no longer uses default text for sizing Fixed a memory leak in PostProcessingConfigDiag where it was never freeing any of the objects it allocated in its constructor. Minor design change to PostProcessingConfigDiag to give padding around elements consistent with the rest of Dolphin's user interface (5px).
Diffstat (limited to 'Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp')
-rw-r--r--Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp65
1 files changed, 42 insertions, 23 deletions
diff --git a/Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp b/Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp
index 87c947bfcd..e8b29081a7 100644
--- a/Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp
+++ b/Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp
@@ -36,11 +36,12 @@ SoftwareVideoConfigDialog::SoftwareVideoConfigDialog(wxWindow* parent, const std
wxString(wxString::Format(_("Dolphin %s Graphics Configuration"), title)))
{
VideoConfig& vconfig = g_Config;
-
vconfig.Load(File::GetUserPath(D_CONFIG_IDX) + "GFX.ini");
wxNotebook* const notebook = new wxNotebook(this, wxID_ANY);
+ const int space5 = FromDIP(5);
+
// -- GENERAL --
{
wxPanel* const page_general = new wxPanel(notebook);
@@ -51,9 +52,11 @@ SoftwareVideoConfigDialog::SoftwareVideoConfigDialog(wxWindow* parent, const std
{
wxStaticBoxSizer* const group_rendering =
new wxStaticBoxSizer(wxVERTICAL, page_general, _("Rendering"));
- szr_general->Add(group_rendering, 0, wxEXPAND | wxALL, 5);
- wxGridSizer* const szr_rendering = new wxGridSizer(2, 5, 5);
- group_rendering->Add(szr_rendering, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+ szr_general->AddSpacer(space5);
+ szr_general->Add(group_rendering, 0, wxEXPAND | wxLEFT | wxRIGHT, space5);
+ wxGridSizer* const szr_rendering = new wxGridSizer(2, space5, space5);
+ group_rendering->Add(szr_rendering, 0, wxEXPAND | wxLEFT | wxRIGHT, space5);
+ group_rendering->AddSpacer(space5);
// backend
wxStaticText* const label_backend = new wxStaticText(page_general, wxID_ANY, _("Backend:"));
@@ -68,8 +71,8 @@ SoftwareVideoConfigDialog::SoftwareVideoConfigDialog(wxWindow* parent, const std
choice_backend->SetStringSelection(StrToWxStr(g_video_backend->GetName()));
choice_backend->Bind(wxEVT_CHOICE, &SoftwareVideoConfigDialog::Event_Backend, this);
- szr_rendering->Add(label_backend, 1, wxALIGN_CENTER_VERTICAL, 5);
- szr_rendering->Add(choice_backend, 1, 0, 0);
+ szr_rendering->Add(label_backend, 0, wxALIGN_CENTER_VERTICAL);
+ szr_rendering->Add(choice_backend, 0, wxALIGN_CENTER_VERTICAL);
if (Core::GetState() != Core::CORE_UNINITIALIZED)
{
@@ -86,9 +89,11 @@ SoftwareVideoConfigDialog::SoftwareVideoConfigDialog(wxWindow* parent, const std
{
wxStaticBoxSizer* const group_info =
new wxStaticBoxSizer(wxVERTICAL, page_general, _("Overlay Information"));
- szr_general->Add(group_info, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
- wxGridSizer* const szr_info = new wxGridSizer(2, 5, 5);
- group_info->Add(szr_info, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+ szr_general->AddSpacer(space5);
+ szr_general->Add(group_info, 0, wxEXPAND | wxLEFT | wxRIGHT, space5);
+ wxGridSizer* const szr_info = new wxGridSizer(2, space5, space5);
+ group_info->Add(szr_info, 0, wxEXPAND | wxLEFT | wxRIGHT, space5);
+ group_info->AddSpacer(space5);
szr_info->Add(
new SettingCheckBox(page_general, _("Various Statistics"), "", vconfig.bOverlayStats));
@@ -98,9 +103,11 @@ SoftwareVideoConfigDialog::SoftwareVideoConfigDialog(wxWindow* parent, const std
{
wxStaticBoxSizer* const group_utility =
new wxStaticBoxSizer(wxVERTICAL, page_general, _("Utility"));
- szr_general->Add(group_utility, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
- wxGridSizer* const szr_utility = new wxGridSizer(2, 5, 5);
- group_utility->Add(szr_utility, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+ szr_general->AddSpacer(space5);
+ szr_general->Add(group_utility, 0, wxEXPAND | wxLEFT | wxRIGHT, space5);
+ wxGridSizer* const szr_utility = new wxGridSizer(2, space5, space5);
+ group_utility->Add(szr_utility, 0, wxEXPAND | wxLEFT | wxRIGHT, space5);
+ group_utility->AddSpacer(space5);
szr_utility->Add(
new SettingCheckBox(page_general, _("Dump Textures"), "", vconfig.bDumpTextures));
@@ -110,10 +117,12 @@ SoftwareVideoConfigDialog::SoftwareVideoConfigDialog(wxWindow* parent, const std
// - debug only
wxStaticBoxSizer* const group_debug_only_utility =
new wxStaticBoxSizer(wxHORIZONTAL, page_general, _("Debug Only"));
- group_utility->Add(group_debug_only_utility, 0, wxEXPAND | wxBOTTOM, 5);
- wxGridSizer* const szr_debug_only_utility = new wxGridSizer(2, 5, 5);
- group_debug_only_utility->Add(szr_debug_only_utility, 1,
- wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+ group_utility->Add(group_debug_only_utility, 0, wxEXPAND);
+ group_utility->AddSpacer(space5);
+ wxGridSizer* const szr_debug_only_utility = new wxGridSizer(2, space5, space5);
+ group_debug_only_utility->AddSpacer(space5);
+ group_debug_only_utility->Add(szr_debug_only_utility, 0, wxEXPAND | wxBOTTOM, space5);
+ group_debug_only_utility->AddSpacer(space5);
szr_debug_only_utility->Add(
new SettingCheckBox(page_general, _("Dump TEV Stages"), "", vconfig.bDumpTevStages));
@@ -125,23 +134,33 @@ SoftwareVideoConfigDialog::SoftwareVideoConfigDialog(wxWindow* parent, const std
{
wxStaticBoxSizer* const group_misc =
new wxStaticBoxSizer(wxVERTICAL, page_general, _("Drawn Object Range"));
- szr_general->Add(group_misc, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
- wxFlexGridSizer* const szr_misc = new wxFlexGridSizer(2, 5, 5);
- group_misc->Add(szr_misc, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+ szr_general->AddSpacer(space5);
+ szr_general->Add(group_misc, 0, wxEXPAND | wxLEFT | wxRIGHT, space5);
+ wxFlexGridSizer* const szr_misc = new wxFlexGridSizer(2, space5, space5);
+ group_misc->Add(szr_misc, 0, wxEXPAND | wxLEFT | wxRIGHT, space5);
+ group_misc->AddSpacer(space5);
szr_misc->Add(
new IntegerSetting<int>(page_general, _("Start"), vconfig.drawStart, 0, 100000));
szr_misc->Add(new IntegerSetting<int>(page_general, _("End"), vconfig.drawEnd, 0, 100000));
}
+ szr_general->AddSpacer(space5);
page_general->SetSizerAndFit(szr_general);
}
- wxBoxSizer* const szr_main = new wxBoxSizer(wxVERTICAL);
- szr_main->Add(notebook, 1, wxEXPAND | wxALL, 5);
- szr_main->Add(new wxButton(this, wxID_OK, _("Close"), wxDefaultPosition), 0,
- wxALIGN_RIGHT | wxRIGHT | wxBOTTOM, 5);
+ wxStdDialogButtonSizer* const btn_sizer = CreateStdDialogButtonSizer(wxOK | wxNO_DEFAULT);
+ btn_sizer->GetAffirmativeButton()->SetLabel(_("Close"));
+ wxBoxSizer* const szr_main = new wxBoxSizer(wxVERTICAL);
+ szr_main->AddSpacer(space5);
+ szr_main->Add(notebook, 1, wxEXPAND | wxLEFT | wxRIGHT, space5);
+ szr_main->AddSpacer(space5);
+ szr_main->Add(btn_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, space5);
+ szr_main->AddSpacer(space5);
+
+ SetLayoutAdaptationMode(wxDIALOG_ADAPTATION_MODE_ENABLED);
+ SetLayoutAdaptationLevel(wxDIALOG_ADAPTATION_STANDARD_SIZER);
SetSizerAndFit(szr_main);
Center();
SetFocus();