Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 11:08:02 -06:00
Code Activity

Linux/MacOSX: solve GUI layout issues although the volume creation wizard still has issues

Browse Source
This commit is contained in:
Mounir IDRASSI
2015-06-24 23:34:15 +02:00
parent 2cd39b37c2
commit d734ce4635
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Main/Forms/Forms.cpp
View File

@@ -531,7 +531,7 @@ MainFrameBase::~MainFrameBase()
WizardFrameBase::WizardFrameBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style ) WizardFrameBase::WizardFrameBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style )
{ {
this->SetSizeHints( wxSize( 750,450 ), wxDefaultSize ); this->SetSizeHints( wxSize( 800,500 ), wxDefaultSize );
MainSizer = new wxBoxSizer( wxVERTICAL ); MainSizer = new wxBoxSizer( wxVERTICAL );
@@ -1505,8 +1505,7 @@ MountOptionsDialogBase::MountOptionsDialogBase( wxWindow* parent, wxWindowID id,
this->SetSizeHints( wxDefaultSize, wxDefaultSize ); this->SetSizeHints( wxDefaultSize, wxDefaultSize );
this->SetExtraStyle( GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY ); this->SetExtraStyle( GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY );
wxBoxSizer* bSizer5; MainSizer = new wxBoxSizer( wxVERTICAL );
bSizer5 = new wxBoxSizer( wxVERTICAL );
wxBoxSizer* bSizer19; wxBoxSizer* bSizer19;
bSizer19 = new wxBoxSizer( wxVERTICAL ); bSizer19 = new wxBoxSizer( wxVERTICAL );
@@ -1653,12 +1652,12 @@ MountOptionsDialogBase::MountOptionsDialogBase( wxWindow* parent, wxWindowID id,
bSizer19->Add( bSizer6, 0, wxEXPAND, 5 ); bSizer19->Add( bSizer6, 0, wxEXPAND, 5 );
bSizer5->Add( bSizer19, 1, wxEXPAND, 5 ); MainSizer->Add( bSizer19, 1, wxEXPAND, 5 );
this->SetSizer( bSizer5 ); this->SetSizer( MainSizer );
this->Layout(); this->Layout();
bSizer5->Fit( this ); MainSizer->Fit( this );
this->Centre( wxBOTH ); this->Centre( wxBOTH );

1
src/Main/Forms/Forms.h
View File

@@ -463,6 +463,7 @@ namespace VeraCrypt
private: private:
protected: protected:
wxBoxSizer* MainSizer;
wxBoxSizer* PasswordSizer; wxBoxSizer* PasswordSizer;
wxButton* OKButton; wxButton* OKButton;
wxButton* CancelButton; wxButton* CancelButton;

1
src/Main/Forms/MountOptionsDialog.cpp
View File

@@ -182,5 +182,6 @@ namespace VeraCrypt
Fit(); Fit();
Layout(); Layout();
MainSizer->Fit( this );
} }
} }

6
src/Main/Forms/TrueCrypt.fbp
View File

@@ -2433,7 +2433,7 @@
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="minimum_size">750,450</property> <property name="minimum_size">800,500</property>
<property name="name">WizardFrameBase</property> <property name="name">WizardFrameBase</property>
<property name="pos"></property> <property name="pos"></property>
<property name="size">-1,-1</property> <property name="size">-1,-1</property>
@@ -10907,9 +10907,9 @@
<event name="OnUpdateUI"></event> <event name="OnUpdateUI"></event>
<object class="wxBoxSizer" expanded="1"> <object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">bSizer5</property> <property name="name">MainSizer</property>
<property name="orient">wxVERTICAL</property> <property name="orient">wxVERTICAL</property>
<property name="permission">none</property> <property name="permission">protected</property>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxEXPAND</property> <property name="flag">wxEXPAND</property>