From af855bc2958f89785df25cd0f96b8f037c00d28c Mon Sep 17 00:00:00 2001 From: Akash Date: Mon, 25 Jan 2016 15:05:54 +0530 Subject: [PATCH 1/2] Log window: better handling of display size. Fixes Issue #1092 , don't remember the display size when the log window is maximized since the display size gets too big and the next time you open PCSX2 you'll see a gigantic log window ;) V2: Fix a wrong indentation. --- pcsx2/gui/ConsoleLogger.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pcsx2/gui/ConsoleLogger.cpp b/pcsx2/gui/ConsoleLogger.cpp index 2fd39b01c0..6040f3970f 100644 --- a/pcsx2/gui/ConsoleLogger.cpp +++ b/pcsx2/gui/ConsoleLogger.cpp @@ -691,7 +691,8 @@ void ConsoleLogFrame::OnMoveAround( wxMoveEvent& evt ) void ConsoleLogFrame::OnResize( wxSizeEvent& evt ) { - m_conf.DisplaySize = GetSize(); + if (!ConsoleLogFrame::IsMaximized()) + m_conf.DisplaySize = GetSize(); evt.Skip(); } From fea95c29516e0e9d7f76e01e4e9e4b7b64efedce Mon Sep 17 00:00:00 2001 From: Akash Date: Mon, 25 Jan 2016 16:03:59 +0530 Subject: [PATCH 2/2] Log window: Fix behavior of some menu items Previously the Enable all / Disable all / Restore defaults menu options ignored the status of Dev/verbose and CDVD reads. The following commit makes them to also impact the other two menu items. --- pcsx2/gui/ConsoleLogger.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pcsx2/gui/ConsoleLogger.cpp b/pcsx2/gui/ConsoleLogger.cpp index 6040f3970f..04644f0a25 100644 --- a/pcsx2/gui/ConsoleLogger.cpp +++ b/pcsx2/gui/ConsoleLogger.cpp @@ -510,6 +510,8 @@ void ConsoleLogFrame::OnEnableAllLogging(wxCommandEvent& evt) if (ConsoleLogSource* log = ConLogSources[i]) log->Enabled = true; } + DevConWriterEnabled = true; + g_Conf->EmuOptions.CdvdVerboseReads = true; OnLoggingChanged(); evt.Skip(); @@ -523,6 +525,8 @@ void ConsoleLogFrame::OnDisableAllLogging(wxCommandEvent& evt) if (ConsoleLogSource* log = ConLogSources[i]) log->Enabled = false; } + DevConWriterEnabled = false; + g_Conf->EmuOptions.CdvdVerboseReads = false; OnLoggingChanged(); evt.Skip(); @@ -536,6 +540,8 @@ void ConsoleLogFrame::OnSetDefaultLogging(wxCommandEvent& evt) if (ConsoleLogSource* log = ConLogSources[i]) log->Enabled = ConLogDefaults[i]; } + DevConWriterEnabled = false; + g_Conf->EmuOptions.CdvdVerboseReads = false; OnLoggingChanged(); evt.Skip();