VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Main/Forms
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2015-06-24 21:34:15 (GMT)
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2015-06-24 21:35:30 (GMT)
commitd734ce4635d468dffd67e7f86c9123df77e89bc4 (patch)
tree4bcb457ac34c190faa77644e4f7cf1cc30a4290b /src/Main/Forms
parent2cd39b37c2bf19f2c06cc2182aa46918178bba31 (diff)
downloadVeraCrypt-d734ce4635d468dffd67e7f86c9123df77e89bc4.zip
VeraCrypt-d734ce4635d468dffd67e7f86c9123df77e89bc4.tar.gz
Linux/MacOSX: solve GUI layout issues although the volume creation wizard still has issues
Diffstat (limited to 'src/Main/Forms')
-rw-r--r--src/Main/Forms/Forms.cpp11
-rw-r--r--src/Main/Forms/Forms.h1
-rw-r--r--src/Main/Forms/MountOptionsDialog.cpp1
-rwxr-xr-xsrc/Main/Forms/TrueCrypt.fbp6
4 files changed, 10 insertions, 9 deletions
diff --git a/src/Main/Forms/Forms.cpp b/src/Main/Forms/Forms.cpp
index 0793a24..0cfd956 100644
--- a/src/Main/Forms/Forms.cpp
+++ b/src/Main/Forms/Forms.cpp
@@ -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 )
{
- this->SetSizeHints( wxSize( 750,450 ), wxDefaultSize );
+ this->SetSizeHints( wxSize( 800,500 ), wxDefaultSize );
MainSizer = new wxBoxSizer( wxVERTICAL );
@@ -1505,8 +1505,7 @@ MountOptionsDialogBase::MountOptionsDialogBase( wxWindow* parent, wxWindowID id,
this->SetSizeHints( wxDefaultSize, wxDefaultSize );
this->SetExtraStyle( GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY );
- wxBoxSizer* bSizer5;
- bSizer5 = new wxBoxSizer( wxVERTICAL );
+ MainSizer = new wxBoxSizer( wxVERTICAL );
wxBoxSizer* bSizer19;
bSizer19 = new wxBoxSizer( wxVERTICAL );
@@ -1653,12 +1652,12 @@ MountOptionsDialogBase::MountOptionsDialogBase( wxWindow* parent, wxWindowID id,
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();
- bSizer5->Fit( this );
+ MainSizer->Fit( this );
this->Centre( wxBOTH );
diff --git a/src/Main/Forms/Forms.h b/src/Main/Forms/Forms.h
index c53d3c3..e2d462f 100644
--- a/src/Main/Forms/Forms.h
+++ b/src/Main/Forms/Forms.h
@@ -463,6 +463,7 @@ namespace VeraCrypt
private:
protected:
+ wxBoxSizer* MainSizer;
wxBoxSizer* PasswordSizer;
wxButton* OKButton;
wxButton* CancelButton;
diff --git a/src/Main/Forms/MountOptionsDialog.cpp b/src/Main/Forms/MountOptionsDialog.cpp
index 9ebbbe9..f044923 100644
--- a/src/Main/Forms/MountOptionsDialog.cpp
+++ b/src/Main/Forms/MountOptionsDialog.cpp
@@ -182,5 +182,6 @@ namespace VeraCrypt
Fit();
Layout();
+ MainSizer->Fit( this );
}
}
diff --git a/src/Main/Forms/TrueCrypt.fbp b/src/Main/Forms/TrueCrypt.fbp
index 31ea58e..24b98f1 100755
--- a/src/Main/Forms/TrueCrypt.fbp
+++ b/src/Main/Forms/TrueCrypt.fbp
@@ -2433,7 +2433,7 @@
<property name="hidden">0</property>
<property name="id">wxID_ANY</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="pos"></property>
<property name="size">-1,-1</property>
@@ -10907,9 +10907,9 @@
<event name="OnUpdateUI"></event>
<object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
- <property name="name">bSizer5</property>
+ <property name="name">MainSizer</property>
<property name="orient">wxVERTICAL</property>
- <property name="permission">none</property>
+ <property name="permission">protected</property>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>