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

MacOSX/Linux: Solve truncated text in some Wizard windows by defining a large enough minimum size.

Browse Source
This commit is contained in:
Mounir IDRASSI
2014-12-07 22:12:10 +01:00
parent 078614fbce
commit 9a6b371c96
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -519,10 +519,9 @@ 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( wxDefaultSize, wxDefaultSize ); this->SetSizeHints( wxSize( 750,450 ), wxDefaultSize );
wxBoxSizer* bSizer92; MainSizer = new wxBoxSizer( wxVERTICAL );
bSizer92 = new wxBoxSizer( wxVERTICAL );
MainPanel = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); MainPanel = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
wxBoxSizer* bSizer63; wxBoxSizer* bSizer63;
@@ -598,12 +597,12 @@ WizardFrameBase::WizardFrameBase( wxWindow* parent, wxWindowID id, const wxStrin
MainPanel->SetSizer( bSizer63 ); MainPanel->SetSizer( bSizer63 );
MainPanel->Layout(); MainPanel->Layout();
bSizer63->Fit( MainPanel ); bSizer63->Fit( MainPanel );
bSizer92->Add( MainPanel, 1, wxEXPAND, 5 ); MainSizer->Add( MainPanel, 1, wxEXPAND, 5 );
this->SetSizer( bSizer92 ); this->SetSizer( MainSizer );
this->Layout(); this->Layout();
bSizer92->Fit( this ); MainSizer->Fit( this );
// Connect Events // Connect Events
this->Connect( wxEVT_ACTIVATE, wxActivateEventHandler( WizardFrameBase::OnActivate ) ); this->Connect( wxEVT_ACTIVATE, wxActivateEventHandler( WizardFrameBase::OnActivate ) );

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

@@ -161,6 +161,7 @@ namespace VeraCrypt
private: private:
protected: protected:
wxBoxSizer* MainSizer;
wxPanel* MainPanel; wxPanel* MainPanel;
wxStaticBitmap* WizardBitmap; wxStaticBitmap* WizardBitmap;
wxStaticText* PageTitleStaticText; wxStaticText* PageTitleStaticText;

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

@@ -2403,7 +2403,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"></property> <property name="minimum_size">750,450</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>
@@ -2452,9 +2452,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">bSizer92</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>