Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-23 17:30:17 +01:00
Code Issues Releases Wiki Activity

ShuttleGui can specify orientation and minimum size...

Browse Source 
... This will be needed for rewrite of EffectUIHost dialog
This commit is contained in:
Paul Licameli
2019-12-10 09:04:05 -05:00
parent bb3159c758
commit f825c32a50
2 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/ShuttleGui.cpp
View File

@@ -120,21 +120,22 @@ for registering for changes.
#include "widgets/WindowAccessible.h"
#endif
ShuttleGuiBase::ShuttleGuiBase(wxWindow * pParent, teShuttleMode ShuttleMode )
ShuttleGuiBase::ShuttleGuiBase(
wxWindow * pParent, teShuttleMode ShuttleMode, bool vertical, wxSize minSize )
: mpDlg{ pParent }
{
wxASSERT( (pParent != NULL ) || ( ShuttleMode != eIsCreating));
mpbOptionalFlag = nullptr;
mpParent = pParent;
mShuttleMode = ShuttleMode;
Init();
Init( vertical, minSize );
}
ShuttleGuiBase::~ShuttleGuiBase()
{
}
void ShuttleGuiBase::Init()
void ShuttleGuiBase::Init(bool vertical, wxSize minSize)
{
mpShuttle = NULL;
mpSizer = NULL;
@@ -172,10 +173,11 @@ void ShuttleGuiBase::Init()
if( !mpSizer )
{
mpParent->SetSizer(mpSizer = safenew wxBoxSizer(wxVERTICAL));
mpParent->SetSizer(
mpSizer = safenew wxBoxSizer(vertical ? wxVERTICAL : wxHORIZONTAL));
}
PushSizer();
mpSizer->SetMinSize(250,100);
mpSizer->SetMinSize(minSize);
}
void ShuttleGuiBase::ResetId()
@@ -2198,13 +2200,14 @@ void SetIfCreated( wxStaticText *&Var, wxStaticText * Val )
#include "../extnpanel-src/GuiWaveTrack.h"
#endif
ShuttleGui::ShuttleGui(wxWindow * pParent, teShuttleMode ShuttleMode) :
ShuttleGuiBase( pParent, ShuttleMode )
ShuttleGui::ShuttleGui(
wxWindow * pParent, teShuttleMode ShuttleMode, bool vertical, wxSize minSize)
: ShuttleGuiBase( pParent, ShuttleMode, vertical, minSize )
{
if( ShuttleMode == eIsCreatingFromPrefs )
{
mShuttleMode = eIsCreating;
Init(); // Wasn't fully done in base constructor because it is only done when eIsCreating is set.
Init( vertical, minSize ); // Wasn't fully done in base constructor because it is only done when eIsCreating is set.
}
else if( ShuttleMode == eIsSavingToPrefs )
{