From b5aceceef201209d7c7c074077a373eff157f883 Mon Sep 17 00:00:00 2001 From: Akash Date: Fri, 21 Aug 2015 13:37:14 +0530 Subject: [PATCH] don't minimize GS window along with main window. previously the GS window (rendering window) also gets minimized with the Main window (GUI) whenever it gets minimized. many users didn't like this behavior, hence make it so that GS window doesn't get minimized along with the main one. The parent window pointer parameter is no longer needed, since the parent parameter at WX Frame has been replaced with Null which doesn't force minimize it due to no parent relationship. --- pcsx2/gui/AppMain.cpp | 2 +- pcsx2/gui/FrameForGS.cpp | 4 ++-- pcsx2/gui/GSFrame.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pcsx2/gui/AppMain.cpp b/pcsx2/gui/AppMain.cpp index af297b914f..236944a818 100644 --- a/pcsx2/gui/AppMain.cpp +++ b/pcsx2/gui/AppMain.cpp @@ -927,7 +927,7 @@ void Pcsx2App::OpenGsPanel() GSFrame* gsFrame = GetGsFramePtr(); if( gsFrame == NULL ) { - gsFrame = new GSFrame( GetMainFramePtr(), GetAppName() ); + gsFrame = new GSFrame(GetAppName() ); m_id_GsFrame = gsFrame->GetId(); switch( wxGetApp().Overrides.GsWindowMode ) diff --git a/pcsx2/gui/FrameForGS.cpp b/pcsx2/gui/FrameForGS.cpp index 44ec185e35..c05f998442 100644 --- a/pcsx2/gui/FrameForGS.cpp +++ b/pcsx2/gui/FrameForGS.cpp @@ -401,8 +401,8 @@ void GSPanel::OnLeftDclick(wxMouseEvent& evt) static const uint TitleBarUpdateMs = 333; -GSFrame::GSFrame(wxWindow* parent, const wxString& title) - : wxFrame(parent, wxID_ANY, title, g_Conf->GSWindow.WindowPos) +GSFrame::GSFrame( const wxString& title) + : wxFrame(NULL, wxID_ANY, title, g_Conf->GSWindow.WindowPos) , m_timer_UpdateTitle( this ) { SetIcons( wxGetApp().GetIconBundle() ); diff --git a/pcsx2/gui/GSFrame.h b/pcsx2/gui/GSFrame.h index 58ee80de68..7089aa94b1 100644 --- a/pcsx2/gui/GSFrame.h +++ b/pcsx2/gui/GSFrame.h @@ -95,7 +95,7 @@ protected: CpuUsageProvider m_CpuUsage; public: - GSFrame(wxWindow* parent, const wxString& title); + GSFrame( const wxString& title); virtual ~GSFrame() throw(); GSPanel* GetViewport();