From 866deee7f13381db15e723bff09c7184f0d1b29d Mon Sep 17 00:00:00 2001 From: hyperiris Date: Sat, 7 Mar 2009 05:32:16 +0000 Subject: [PATCH] try to fix resize the GameListControl after stop git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2588 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DolphinWX/Src/Frame.cpp | 16 +++++++++++----- Source/Core/DolphinWX/Src/Frame.h | 1 + Source/Core/DolphinWX/Src/FrameTools.cpp | 1 + 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index 2701e49104..f17ecb6f02 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -339,12 +339,18 @@ CFrame::CFrame(wxFrame* parent, wxLC_REPORT | wxSUNKEN_BORDER | wxLC_ALIGN_LEFT); sizerPanel = new wxBoxSizer(wxHORIZONTAL); - sizerPanel->Add(m_GameListCtrl, 2, wxEXPAND); + sizerPanel->Add(m_GameListCtrl, 1, wxEXPAND | wxALL); m_Panel->SetSizer(sizerPanel); + sizerFrame = new wxBoxSizer(wxHORIZONTAL); + sizerFrame->Add(m_Panel, 1, wxEXPAND | wxALL); + this->SetSizer(sizerFrame); + // Create the toolbar RecreateToolbar(); + FitInside(); + Show(); // Show the window // Create list of available plugins for the configuration window @@ -508,7 +514,7 @@ void CFrame::OnKeyUp(wxKeyEvent& event) // Returns a timestamp with decimals for precise time comparisons -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ? double GetDoubleTime() { wxDateTime datetime = wxDateTime::UNow(); // Get timestamp @@ -529,7 +535,7 @@ double GetDoubleTime() // Detect double click. Kind of, for some reason we have to manually create the double click for now. -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ? void CFrame::OnDoubleClick(wxMouseEvent& event) { // Don't block the mouse click @@ -574,7 +580,7 @@ void CFrame::OnDoubleClick(wxMouseEvent& event) // Check for mouse motion. Here we process the bHideCursor setting. -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ? void CFrame::OnMotion(wxMouseEvent& event) { event.Skip(); @@ -629,7 +635,7 @@ void CFrame::OnMotion(wxMouseEvent& event) } // Check for mouse status a couple of times per second for the auto hide option -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ? #if wxUSE_TIMER void CFrame::Update() { diff --git a/Source/Core/DolphinWX/Src/Frame.h b/Source/Core/DolphinWX/Src/Frame.h index 92dd666870..bd5523c097 100644 --- a/Source/Core/DolphinWX/Src/Frame.h +++ b/Source/Core/DolphinWX/Src/Frame.h @@ -93,6 +93,7 @@ class CFrame : public wxFrame private: wxBoxSizer* sizerPanel; + wxBoxSizer* sizerFrame; CGameListCtrl* m_GameListCtrl; wxPanel* m_Panel; wxToolBar* TheToolBar; diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index b9b191540e..c1ab6549b6 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -837,6 +837,7 @@ void CFrame::UpdateGUI() } TheToolBar->Realize(); + FitInside(); }