ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GUI: Fixed fullscreen mode while debugging, added perspectives 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4057 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
John Peterson 2009-08-25 07:05:53 +00:00
parent 53a8ca52b6
commit 421d30b746
2 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Source/Core/DolphinWX/Src/Frame.cpp
View File

@ -373,26 +373,24 @@ CFrame::CFrame(bool showLogWindow,
{ {
m_Mgr->AddPane(m_Panel, wxAuiPaneInfo(). m_Mgr->AddPane(m_Panel, wxAuiPaneInfo().
Name(wxT("Pane1")).Caption(wxT("Pane1")). Name(wxT("Pane1")).Caption(wxT("Pane1")).
CenterPane().PaneBorder(true)); CenterPane().Layer(0).PaneBorder(false));
/**/ AuiFullscreen = m_Mgr->SavePerspective();
m_Mgr->GetPane(wxT("Pane1")).PaneBorder(true);
m_Mgr->AddPane(m_Panel2, wxAuiPaneInfo(). m_Mgr->AddPane(m_Panel2, wxAuiPaneInfo().
Name(wxT("Pane2")).Caption(wxT("Pane2")). Name(wxT("Pane2")).Caption(wxT("Pane2")).
CenterPane()); CenterPane().Layer(1));
m_Mgr->AddPane(g_pCodeWindow, wxAuiPaneInfo(). m_Mgr->AddPane(g_pCodeWindow, wxAuiPaneInfo().
Name(wxT("Pane3")).Caption(wxT("Pane3")). Name(wxT("Pane3")).Caption(wxT("Pane3")).
CenterPane().Right()); CenterPane().Layer(2));
} }
else else
{ {
/*
sizerFrame = new wxBoxSizer(wxHORIZONTAL);
sizerFrame->Add(m_Panel, 1, wxEXPAND | wxALL);
this->SetSizer(sizerFrame);
*/
m_Mgr->AddPane(m_Panel, wxAuiPaneInfo(). m_Mgr->AddPane(m_Panel, wxAuiPaneInfo().
Name(wxT("Pane1")).Caption(wxT("Pane1")). Name(wxT("Pane1")).Caption(wxT("Pane1")).
CenterPane().PaneBorder(false)); CenterPane().PaneBorder(false));
AuiFullscreen = m_Mgr->SavePerspective();
} }
// Open log window // Open log window
@ -402,6 +400,13 @@ CFrame::CFrame(bool showLogWindow,
// Create toolbar // Create toolbar
RecreateToolbar(); RecreateToolbar();
if (!SConfig::GetInstance().m_InterfaceToolbar) TheToolBar->Hide(); if (!SConfig::GetInstance().m_InterfaceToolbar) TheToolBar->Hide();
AuiMode1 = m_Mgr->SavePerspective();
// Save perspectives
AuiMode2 = m_Mgr->SavePerspective();
m_Mgr->GetPane(wxT("Pane2")).Layer(0);
m_Mgr->GetPane(wxT("Pane3")).Layer(0).Right();
AuiMode1 = m_Mgr->SavePerspective();
// Show window // Show window
Show(); Show();
@ -487,15 +492,9 @@ void CFrame::DoFullscreen(bool _F)
{ {
ShowFullScreen(_F); ShowFullScreen(_F);
if (_F) if (_F)
{ m_Mgr->LoadPerspective(AuiFullscreen, true);
m_Mgr->GetPane(wxT("TBMain")).Hide();
m_Mgr->Update();
}
else else
{ m_Mgr->LoadPerspective(AuiMode1, true);
m_Mgr->GetPane(wxT("TBMain")).Show();
m_Mgr->Update();
}
} }
///////////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////////////

10
Source/Core/DolphinWX/Src/Frame.h
View File

@ -96,8 +96,7 @@ class CFrame : public wxFrame
// --------------- // ---------------
private: private:
wxAuiManager *m_Mgr;
bool UseDebugger; bool UseDebugger;
wxBoxSizer* sizerPanel; wxBoxSizer* sizerPanel;
wxBoxSizer* sizerFrame; wxBoxSizer* sizerFrame;
@ -108,6 +107,13 @@ class CFrame : public wxFrame
bool m_bLogWindow; bool m_bLogWindow;
CLogWindow* m_LogWindow; CLogWindow* m_LogWindow;
// AUI
wxAuiManager *m_Mgr;
// Perspectives
wxString AuiFullscreen;
wxString AuiMode1;
wxString AuiMode2;
char **drives; char **drives;
enum EToolbar enum EToolbar