realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 10:13:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Dialog layout fixes.

Browse Source
This commit is contained in:
Wayne Stambaugh 2023-11-05 08:09:27 -05:00
parent c53b318759
commit d34e6636d0
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/dialogs/dialog_unit_entry.cpp
View File

@ -36,6 +36,9 @@ WX_UNIT_ENTRY_DIALOG::WX_UNIT_ENTRY_DIALOG( EDA_DRAW_FRAME* aParent, const wxStr
SetInitialFocus( m_textCtrl ); SetInitialFocus( m_textCtrl );
SetupStandardButtons(); SetupStandardButtons();
Layout();
bSizerMain->Fit( this );
} }
@ -59,8 +62,12 @@ WX_PT_ENTRY_DIALOG::WX_PT_ENTRY_DIALOG( EDA_DRAW_FRAME* aParent, const wxString&
SetInitialFocus( m_textCtrlX ); SetInitialFocus( m_textCtrlX );
SetupStandardButtons(); SetupStandardButtons();
Layout();
bSizerMain->Fit( this );
} }
VECTOR2I WX_PT_ENTRY_DIALOG::GetValue() VECTOR2I WX_PT_ENTRY_DIALOG::GetValue()
{ {
return VECTOR2I( m_unit_binder_x.GetIntValue(), m_unit_binder_y.GetIntValue() ); return VECTOR2I( m_unit_binder_x.GetIntValue(), m_unit_binder_y.GetIntValue() );

2
common/dialogs/dialog_unit_entry_base.cpp
View File

@ -13,7 +13,6 @@ WX_UNIT_ENTRY_DIALOG_BASE::WX_UNIT_ENTRY_DIALOG_BASE( wxWindow* parent, wxWindow
{ {
this->SetSizeHints( wxDefaultSize, wxDefaultSize ); this->SetSizeHints( wxDefaultSize, wxDefaultSize );
wxBoxSizer* bSizerMain;
bSizerMain = new wxBoxSizer( wxVERTICAL ); bSizerMain = new wxBoxSizer( wxVERTICAL );
wxBoxSizer* bSizerContent; wxBoxSizer* bSizerContent;
@ -67,7 +66,6 @@ WX_PT_ENTRY_DIALOG_BASE::WX_PT_ENTRY_DIALOG_BASE( wxWindow* parent, wxWindowID i
{ {
this->SetSizeHints( wxDefaultSize, wxDefaultSize ); this->SetSizeHints( wxDefaultSize, wxDefaultSize );
wxBoxSizer* bSizerMain;
bSizerMain = new wxBoxSizer( wxVERTICAL ); bSizerMain = new wxBoxSizer( wxVERTICAL );
wxFlexGridSizer* fgSizer; wxFlexGridSizer* fgSizer;

4
common/dialogs/dialog_unit_entry_base.fbp
View File

@ -60,7 +60,7 @@
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">bSizerMain</property> <property name="name">bSizerMain</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|wxRIGHT|wxLEFT</property> <property name="flag">wxEXPAND|wxRIGHT|wxLEFT</property>
@ -330,7 +330,7 @@
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">bSizerMain</property> <property name="name">bSizerMain</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|wxALL</property> <property name="flag">wxEXPAND|wxALL</property>

2
common/dialogs/dialog_unit_entry_base.h
View File

@ -33,6 +33,7 @@ class WX_UNIT_ENTRY_DIALOG_BASE : public DIALOG_SHIM
private: private:
protected: protected:
wxBoxSizer* bSizerMain;
wxStaticText* m_label; wxStaticText* m_label;
wxTextCtrl* m_textCtrl; wxTextCtrl* m_textCtrl;
wxStaticText* m_unit_label; wxStaticText* m_unit_label;
@ -56,6 +57,7 @@ class WX_PT_ENTRY_DIALOG_BASE : public DIALOG_SHIM
private: private:
protected: protected:
wxBoxSizer* bSizerMain;
wxStaticText* m_labelX; wxStaticText* m_labelX;
wxTextCtrl* m_textCtrlX; wxTextCtrl* m_textCtrlX;
wxStaticText* m_unitsX; wxStaticText* m_unitsX;