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

gui: Use SetSizerAndFit after dialogs are constructed. 

It seems to fix the button UI problem for Linux wx3.0 builds.
This commit is contained in:
Jonathan Li 2015-09-04 17:23:50 +01:00
parent 9052930ebc
commit 31a505768d
4 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pcsx2/gui/Dialogs/ConfirmationDialogs.cpp
View File

@ -147,6 +147,7 @@ wxWindowID pxIssueConfirmation( wxDialogWithHelpers& confirmDlg, const MsgButton
confirmDlg += new ModalButtonPanel( &confirmDlg, buttons ) | pxCenter.Border( wxTOP, 8 ); confirmDlg += new ModalButtonPanel( &confirmDlg, buttons ) | pxCenter.Border( wxTOP, 8 );
buttons.SetBestFocus( confirmDlg ); buttons.SetBestFocus( confirmDlg );
confirmDlg.SetSizerAndFit(confirmDlg.GetSizer());
return confirmDlg.ShowModal(); return confirmDlg.ShowModal();
} }

2
pcsx2/gui/Dialogs/GameDatabaseDialog.cpp
View File

@ -26,4 +26,6 @@ Dialogs::GameDatabaseDialog::GameDatabaseDialog(wxWindow* parent)
ScopedBusyCursor busy( Cursor_ReallyBusy ); ScopedBusyCursor busy( Cursor_ReallyBusy );
*this += new GameDatabasePanel(this) | StdExpand(); *this += new GameDatabasePanel(this) | StdExpand();
AddOkCancel(); AddOkCancel();
SetSizerAndFit(GetSizer());
} }

2
pcsx2/gui/Dialogs/LogOptionsDialog.cpp
View File

@ -28,4 +28,6 @@ Dialogs::LogOptionsDialog::LogOptionsDialog( wxWindow* parent )
{ {
*this += new LogOptionsPanel( this ) | StdExpand(); *this += new LogOptionsPanel( this ) | StdExpand();
AddOkCancel(); AddOkCancel();
SetSizerAndFit(GetSizer());
} }

8
pcsx2/gui/Dialogs/SysConfigDialog.cpp
View File

@ -229,6 +229,8 @@ Dialogs::SysConfigDialog::SysConfigDialog(wxWindow* parent)
AddOkCancel(); AddOkCancel();
AddPresetsControl(); AddPresetsControl();
SetSizerAndFit(GetSizer());
if( wxGetApp().Overrides.HasCustomHacks() ) if( wxGetApp().Overrides.HasCustomHacks() )
wxGetApp().PostMethod( CheckHacksOverrides ); wxGetApp().PostMethod( CheckHacksOverrides );
} }
@ -248,11 +250,13 @@ Dialogs::ComponentsConfigDialog::ComponentsConfigDialog(wxWindow* parent)
AddListbook(); AddListbook();
AddOkCancel(); AddOkCancel();
SetSizerAndFit(GetSizer());
if( wxGetApp().Overrides.HasPluginsOverride() ) if( wxGetApp().Overrides.HasPluginsOverride() )
wxGetApp().PostMethod( CheckPluginsOverrides ); wxGetApp().PostMethod( CheckPluginsOverrides );
} }
// FIXME: Purge? It's unused and does nothing.
Dialogs::InterfaceConfigDialog::InterfaceConfigDialog(wxWindow *parent) Dialogs::InterfaceConfigDialog::InterfaceConfigDialog(wxWindow *parent)
: BaseConfigurationDialog( parent, AddAppName(_("Appearance/Themes - %s")), 400 ) : BaseConfigurationDialog( parent, AddAppName(_("Appearance/Themes - %s")), 400 )
{ {
@ -281,6 +285,8 @@ Dialogs::InterfaceLanguageDialog::InterfaceLanguageDialog(wxWindow* parent)
*this += new Panels::LanguageSelectionPanel(this, false) | StdCenter(); *this += new Panels::LanguageSelectionPanel(this, false) | StdCenter();
AddOkCancel(); AddOkCancel();
SetSizerAndFit(GetSizer());
} }
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------