From 0e2ec9c2cb3ff9e272fb353f39fb9ebf6e5c28ef Mon Sep 17 00:00:00 2001 From: Gregory Hainaut Date: Sat, 19 Nov 2016 11:27:20 +0100 Subject: [PATCH] pcsx2 gui: reduce the padding to 2 for low cost display --- common/include/Utilities/wxGuiTools.h | 3 ++- common/src/Utilities/wxGuiTools.cpp | 8 ++++++++ pcsx2/gui/AppInit.cpp | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/common/include/Utilities/wxGuiTools.h b/common/include/Utilities/wxGuiTools.h index 4c679c2961..33e520fd7a 100644 --- a/common/include/Utilities/wxGuiTools.h +++ b/common/include/Utilities/wxGuiTools.h @@ -40,7 +40,7 @@ class wxSpinCtrl; namespace pxSizerFlags { -static const int StdPadding = 4; +static int StdPadding = 4; extern wxSizerFlags StdSpace(); extern wxSizerFlags StdCenter(); @@ -49,6 +49,7 @@ extern wxSizerFlags TopLevelBox(); extern wxSizerFlags SubGroup(); extern wxSizerFlags StdButton(); extern wxSizerFlags Checkbox(); +extern void SetBestPadding(); }; #define wxSF wxSizerFlags() diff --git a/common/src/Utilities/wxGuiTools.cpp b/common/src/Utilities/wxGuiTools.cpp index ae6be020d4..aeed442d3a 100644 --- a/common/src/Utilities/wxGuiTools.cpp +++ b/common/src/Utilities/wxGuiTools.cpp @@ -269,6 +269,14 @@ wxSizerFlags pxSizerFlags::Checkbox() return StdExpand(); } +void pxSizerFlags::SetBestPadding() +{ + if (wxSystemSettings::GetMetric(wxSYS_SCREEN_X) > 1024 && wxSystemSettings::GetMetric(wxSYS_SCREEN_Y) > 864) + StdPadding = 4; + else + StdPadding = 2; +} + // -------------------------------------------------------------------------------------- // pxTextWrapper / pxTextWrapperBase (implementations) // -------------------------------------------------------------------------------------- diff --git a/pcsx2/gui/AppInit.cpp b/pcsx2/gui/AppInit.cpp index 99eec6ce5d..4353b88980 100644 --- a/pcsx2/gui/AppInit.cpp +++ b/pcsx2/gui/AppInit.cpp @@ -477,6 +477,7 @@ bool Pcsx2App::OnInit() // Start GUI and/or Direct Emulation // ------------------------------------- + pxSizerFlags::SetBestPadding(); if( Startup.ForceConsole ) g_Conf->ProgLogBox.Visible = true; OpenProgramLog(); AllocateCoreStuffs();