From bdc1dc42a683fec9c6b0d0991e16842bbd201e9d Mon Sep 17 00:00:00 2001
From: El Mostafa Idrassi <el-mostafa.idrassi@prestalab.net>
Date: Tue, 15 Oct 2019 23:43:49 +0100
Subject: Small GUI enhancements (#521)

---
 src/Main/Forms/Forms.cpp     | 12 ++++++------
 src/Main/Forms/TrueCrypt.fbp | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/Main/Forms/Forms.cpp b/src/Main/Forms/Forms.cpp
index 68424cc7..c0a4070c 100644
--- a/src/Main/Forms/Forms.cpp
+++ b/src/Main/Forms/Forms.cpp
@@ -328,7 +328,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
 	VolumeStaticBoxSizer->Add( VolumeGridBagSizer, 1, wxEXPAND|wxALL, 4 );
 
 
-	LowStaticBoxSizer->Add( VolumeStaticBoxSizer, 1, wxEXPAND, 5 );
+	LowStaticBoxSizer->Add( VolumeStaticBoxSizer, 1, wxEXPAND|wxALL, 5 );
 
 
 	LowStaticBoxSizer->Add( 0, 0, 0, 0, 5 );
@@ -344,7 +344,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
 	VolumeButton->SetDefault();
 	VolumeButton->SetMinSize( wxSize( -1,32 ) );
 
-	sbSizer4->Add( VolumeButton, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP, 2 );
+	sbSizer4->Add( VolumeButton, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxALL, 2 );
 
 
 	gSizer2->Add( sbSizer4, 1, wxEXPAND, 0 );
@@ -356,7 +356,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
 	MountAllDevicesButton = new wxButton( MainPanel, wxID_ANY, _("&Auto-Mount Devices"), wxDefaultPosition, wxDefaultSize, 0 );
 	MountAllDevicesButton->SetMinSize( wxSize( -1,32 ) );
 
-	sbSizer41->Add( MountAllDevicesButton, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP, 2 );
+	sbSizer41->Add( MountAllDevicesButton, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxALL, 2 );
 
 
 	gSizer2->Add( sbSizer41, 1, wxEXPAND, 5 );
@@ -368,7 +368,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
 	DismountAllButton = new wxButton( MainPanel, wxID_ANY, _("Di&smount All"), wxDefaultPosition, wxDefaultSize, 0 );
 	DismountAllButton->SetMinSize( wxSize( -1,32 ) );
 
-	sbSizer42->Add( DismountAllButton, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP, 2 );
+	sbSizer42->Add( DismountAllButton, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxALL, 2 );
 
 
 	gSizer2->Add( sbSizer42, 1, wxEXPAND, 5 );
@@ -380,13 +380,13 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
 	ExitButton = new wxButton( MainPanel, wxID_ANY, _("E&xit"), wxDefaultPosition, wxDefaultSize, 0 );
 	ExitButton->SetMinSize( wxSize( -1,32 ) );
 
-	sbSizer43->Add( ExitButton, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP, 2 );
+	sbSizer43->Add( ExitButton, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxALL, 2 );
 
 
 	gSizer2->Add( sbSizer43, 1, wxEXPAND, 5 );
 
 
-	LowStaticBoxSizer->Add( gSizer2, 0, wxEXPAND, 5 );
+	LowStaticBoxSizer->Add( gSizer2, 0, wxEXPAND|wxALL, 5 );
 
 
 	bSizer48->Add( LowStaticBoxSizer, 0, wxEXPAND, 5 );
diff --git a/src/Main/Forms/TrueCrypt.fbp b/src/Main/Forms/TrueCrypt.fbp
index 3b1dd09c..d512ce82 100644
--- a/src/Main/Forms/TrueCrypt.fbp
+++ b/src/Main/Forms/TrueCrypt.fbp
@@ -1373,7 +1373,7 @@
                                             </object>
                                             <object class="sizeritem" expanded="1">
                                                 <property name="border">5</property>
-                                                <property name="flag">wxEXPAND</property>
+                                                <property name="flag">wxEXPAND|wxALL</property>
                                                 <property name="proportion">1</property>
                                                 <object class="wxStaticBoxSizer" expanded="1">
                                                     <property name="id">wxID_ANY</property>
@@ -1989,7 +1989,7 @@
                                             </object>
                                             <object class="sizeritem" expanded="1">
                                                 <property name="border">5</property>
-                                                <property name="flag">wxEXPAND</property>
+                                                <property name="flag">wxEXPAND|wxALL</property>
                                                 <property name="proportion">0</property>
                                                 <object class="wxGridSizer" expanded="1">
                                                     <property name="cols">4</property>
@@ -2013,7 +2013,7 @@
                                                             <event name="OnUpdateUI"></event>
                                                             <object class="sizeritem" expanded="1">
                                                                 <property name="border">2</property>
-                                                                <property name="flag">wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP</property>
+                                                                <property name="flag">wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxALL</property>
                                                                 <property name="proportion">1</property>
                                                                 <object class="wxButton" expanded="1">
                                                                     <property name="BottomDockable">1</property>
@@ -2115,7 +2115,7 @@
                                                             <event name="OnUpdateUI"></event>
                                                             <object class="sizeritem" expanded="1">
                                                                 <property name="border">2</property>
-                                                                <property name="flag">wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP</property>
+                                                                <property name="flag">wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxALL</property>
                                                                 <property name="proportion">1</property>
                                                                 <object class="wxButton" expanded="1">
                                                                     <property name="BottomDockable">1</property>
@@ -2217,7 +2217,7 @@
                                                             <event name="OnUpdateUI"></event>
                                                             <object class="sizeritem" expanded="1">
                                                                 <property name="border">2</property>
-                                                                <property name="flag">wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP</property>
+                                                                <property name="flag">wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxALL</property>
                                                                 <property name="proportion">1</property>
                                                                 <object class="wxButton" expanded="1">
                                                                     <property name="BottomDockable">1</property>
@@ -2319,7 +2319,7 @@
                                                             <event name="OnUpdateUI"></event>
                                                             <object class="sizeritem" expanded="1">
                                                                 <property name="border">2</property>
-                                                                <property name="flag">wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP</property>
+                                                                <property name="flag">wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxALL</property>
                                                                 <property name="proportion">1</property>
                                                                 <object class="wxButton" expanded="1">
                                                                     <property name="BottomDockable">1</property>
-- 
cgit v1.2.3