summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/LogConfigWindow.cpp
diff options
context:
space:
mode:
authorEmptyChaos <EmptyChaos@users.noreply.github.com>2016-10-03 07:29:50 +0000
committerEmptyChaos <EmptyChaos@users.noreply.github.com>2016-10-04 13:47:22 +1100
commit27d295ec7e456240d97327b3c4351d3e168c479f (patch)
tree535b5771a2d0151dac92c5eedcd6d25695f073de /Source/Core/DolphinWX/LogConfigWindow.cpp
parentf39c301579a5a88caa7cb4cea9e6d44f7d4c94df (diff)
WX: HiDPI: FrameAUI / Debugger
Changes: - MemoryWindow was cleaned up and gives more feedback on searches. Some bugs were fixed as well: - A complex bug that allowed tearing off tabs and opening multiple copies of a debug panel which lead to segfaults - Another segfault related to right-click menus on code/memory views when those tools were floating in their own window.
Diffstat (limited to 'Source/Core/DolphinWX/LogConfigWindow.cpp')
-rw-r--r--Source/Core/DolphinWX/LogConfigWindow.cpp28
1 files changed, 12 insertions, 16 deletions
diff --git a/Source/Core/DolphinWX/LogConfigWindow.cpp b/Source/Core/DolphinWX/LogConfigWindow.cpp
index da517d288f..52562507f6 100644
--- a/Source/Core/DolphinWX/LogConfigWindow.cpp
+++ b/Source/Core/DolphinWX/LogConfigWindow.cpp
@@ -25,18 +25,11 @@ LogConfigWindow::LogConfigWindow(wxWindow* parent, wxWindowID id)
_("Log Configuration")),
enableAll(true)
{
- Bind(wxEVT_CLOSE_WINDOW, &LogConfigWindow::OnClose, this);
- SetMinSize(wxSize(100, 100));
m_LogManager = LogManager::GetInstance();
CreateGUIControls();
LoadSettings();
}
-void LogConfigWindow::OnClose(wxCloseEvent& event)
-{
- SaveSettings();
-}
-
void LogConfigWindow::CreateGUIControls()
{
// Verbosity
@@ -68,23 +61,26 @@ void LogConfigWindow::CreateGUIControls()
for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; i++)
m_checks->Append(StrToWxStr(m_LogManager->GetFullName((LogTypes::LOG_TYPE)i)));
+ const int space1 = FromDIP(1);
+ const int space5 = FromDIP(5);
+
// Sizers
wxStaticBoxSizer* sbOutputs = new wxStaticBoxSizer(wxVERTICAL, this, _("Logger Outputs"));
- sbOutputs->Add(m_writeFileCB, 0, wxDOWN, 1);
- sbOutputs->Add(m_writeConsoleCB, 0, wxDOWN, 1);
- sbOutputs->Add(m_writeWindowCB, 0);
+ sbOutputs->Add(m_writeFileCB, 0);
+ sbOutputs->Add(m_writeConsoleCB, 0, wxTOP, space1);
+ sbOutputs->Add(m_writeWindowCB, 0, wxTOP, space1);
wxStaticBoxSizer* sbLogTypes = new wxStaticBoxSizer(wxVERTICAL, this, _("Log Types"));
sbLogTypes->Add(m_checks, 1, wxEXPAND);
wxBoxSizer* sMain = new wxBoxSizer(wxVERTICAL);
- sMain->Add(m_verbosity, 0, wxEXPAND | wxLEFT | wxRIGHT, 5);
- sMain->Add(sbOutputs, 0, wxEXPAND | wxLEFT | wxRIGHT, 5);
- sMain->Add(btn_toggle_all, 0, wxEXPAND | wxLEFT | wxRIGHT, 5);
- sMain->Add(sbLogTypes, 1, wxEXPAND | wxLEFT | wxRIGHT, 5);
+ sMain->Add(m_verbosity, 0, wxEXPAND | wxLEFT | wxRIGHT, space5);
+ sMain->Add(sbOutputs, 0, wxEXPAND | wxLEFT | wxRIGHT, space5);
+ sMain->Add(btn_toggle_all, 0, wxEXPAND | wxLEFT | wxRIGHT, space5);
+ sMain->Add(sbLogTypes, 1, wxEXPAND | wxLEFT | wxRIGHT, space5);
- SetSizer(sMain);
- Layout();
+ sMain->SetMinSize(FromDIP(wxSize(100, 100)));
+ SetSizerAndFit(sMain);
}
void LogConfigWindow::LoadSettings()