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

Fix incorrect board editor text box bitmap button sizes.

Browse Source 
Fixes https://gitlab.com/kicad/code/kicad/-/issues/21050
This commit is contained in:
Wayne Stambaugh 2025-06-02 14:39:27 -04:00
parent f892f39674
commit 473ceb90cc
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcbnew/dialogs/dialog_textbox_properties.cpp
View File

@ -150,6 +150,8 @@ DIALOG_TEXTBOX_PROPERTIES::DIALOG_TEXTBOX_PROPERTIES( PCB_BASE_EDIT_FRAME* aPare
nullptr, this ); nullptr, this );
finishDialogSettings(); finishDialogSettings();
Layout();
bMainSizer->Fit( this );
} }

2
pcbnew/dialogs/dialog_textbox_properties_base.cpp
View File

@ -17,7 +17,6 @@ DIALOG_TEXTBOX_PROPERTIES_BASE::DIALOG_TEXTBOX_PROPERTIES_BASE( wxWindow* parent
{ {
this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize ); this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
wxBoxSizer* bMainSizer;
bMainSizer = new wxBoxSizer( wxVERTICAL ); bMainSizer = new wxBoxSizer( wxVERTICAL );
m_MultiLineSizer = new wxBoxSizer( wxVERTICAL ); m_MultiLineSizer = new wxBoxSizer( wxVERTICAL );
@ -68,7 +67,6 @@ DIALOG_TEXTBOX_PROPERTIES_BASE::DIALOG_TEXTBOX_PROPERTIES_BASE( wxWindow* parent
gbSizer1 = new wxGridBagSizer( 3, 3 ); gbSizer1 = new wxGridBagSizer( 3, 3 );
gbSizer1->SetFlexibleDirection( wxBOTH ); gbSizer1->SetFlexibleDirection( wxBOTH );
gbSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); gbSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
gbSizer1->SetEmptyCellSize( wxSize( -1,8 ) );
m_cbLocked = new wxCheckBox( this, wxID_ANY, _("Locked"), wxDefaultPosition, wxDefaultSize, 0 ); m_cbLocked = new wxCheckBox( this, wxID_ANY, _("Locked"), wxDefaultPosition, wxDefaultSize, 0 );
gbSizer1->Add( m_cbLocked, wxGBPosition( 0, 0 ), wxGBSpan( 1, 3 ), wxBOTTOM|wxRIGHT|wxLEFT, 5 ); gbSizer1->Add( m_cbLocked, wxGBPosition( 0, 0 ), wxGBSpan( 1, 3 ), wxBOTTOM|wxRIGHT|wxLEFT, 5 );

8
pcbnew/dialogs/dialog_textbox_properties_base.fbp
View File

@ -64,7 +64,7 @@
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">bMainSizer</property> <property name="name">bMainSizer</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="true"> <object class="sizeritem" expanded="true">
<property name="border">10</property> <property name="border">10</property>
<property name="flag">wxEXPAND|wxALL</property> <property name="flag">wxEXPAND|wxALL</property>
@ -212,7 +212,7 @@
<property name="flag">wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT</property> <property name="flag">wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxGridBagSizer" expanded="true"> <object class="wxGridBagSizer" expanded="true">
<property name="empty_cell_size">-1,8</property> <property name="empty_cell_size">-1,-1</property>
<property name="flexible_direction">wxBOTH</property> <property name="flexible_direction">wxBOTH</property>
<property name="growablecols">3</property> <property name="growablecols">3</property>
<property name="growablerows"></property> <property name="growablerows"></property>
@ -558,14 +558,14 @@
<event name="OnChoice">onFontSelected</event> <event name="OnChoice">onFontSelected</event>
</object> </object>
</object> </object>
<object class="gbsizeritem" expanded="false"> <object class="gbsizeritem" expanded="true">
<property name="border">8</property> <property name="border">8</property>
<property name="colspan">3</property> <property name="colspan">3</property>
<property name="column">4</property> <property name="column">4</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT</property> <property name="flag">wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT</property>
<property name="row">3</property> <property name="row">3</property>
<property name="rowspan">1</property> <property name="rowspan">1</property>
<object class="wxBoxSizer" expanded="false"> <object class="wxBoxSizer" expanded="true">
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">bSizerButtonBar</property> <property name="name">bSizerButtonBar</property>
<property name="orient">wxHORIZONTAL</property> <property name="orient">wxHORIZONTAL</property>

1
pcbnew/dialogs/dialog_textbox_properties_base.h
View File

@ -46,6 +46,7 @@ class DIALOG_TEXTBOX_PROPERTIES_BASE : public DIALOG_SHIM
private: private:
protected: protected:
wxBoxSizer* bMainSizer;
wxBoxSizer* m_MultiLineSizer; wxBoxSizer* m_MultiLineSizer;
wxStyledTextCtrl* m_MultiLineText; wxStyledTextCtrl* m_MultiLineText;
wxCheckBox* m_cbLocked; wxCheckBox* m_cbLocked;