haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix dialog grow behaviour.

This commit is contained in:
Jeff Young 2020-05-06 20:37:31 +01:00
parent 51e72ed9ba
commit d56dced0ab
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp
View File

@ -141,6 +141,7 @@ DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE::DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_
wxFlexGridSizer* fgSizer1; wxFlexGridSizer* fgSizer1;
fgSizer1 = new wxFlexGridSizer( 0, 6, 4, 0 ); fgSizer1 = new wxFlexGridSizer( 0, 6, 4, 0 );
fgSizer1->AddGrowableCol( 1 );
fgSizer1->AddGrowableCol( 3 ); fgSizer1->AddGrowableCol( 3 );
fgSizer1->SetFlexibleDirection( wxBOTH ); fgSizer1->SetFlexibleDirection( wxBOTH );
fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );

2
eeschema/dialogs/dialog_global_edit_text_and_graphics_base.fbp
View File

@ -1568,7 +1568,7 @@
<object class="wxFlexGridSizer" expanded="1"> <object class="wxFlexGridSizer" expanded="1">
<property name="cols">6</property> <property name="cols">6</property>
<property name="flexible_direction">wxBOTH</property> <property name="flexible_direction">wxBOTH</property>
<property name="growablecols">3</property> <property name="growablecols">1,3</property>
<property name="growablerows"></property> <property name="growablerows"></property>
<property name="hgap">0</property> <property name="hgap">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>

7
eeschema/dialogs/panel_eeschema_color_settings.cpp
View File

@ -45,13 +45,6 @@
#include <sch_base_frame.h> #include <sch_base_frame.h>
#include <widgets/color_swatch.h> #include <widgets/color_swatch.h>
// Width and height of every (color-displaying / bitmap) button in dialog units
const wxSize BUTTON_SIZE( 24, 12 );
const wxSize BUTTON_BORDER( 4, 4 );
// Button ID starting point
constexpr int FIRST_BUTTON_ID = 1800;
PANEL_EESCHEMA_COLOR_SETTINGS::PANEL_EESCHEMA_COLOR_SETTINGS( SCH_BASE_FRAME* aFrame, PANEL_EESCHEMA_COLOR_SETTINGS::PANEL_EESCHEMA_COLOR_SETTINGS( SCH_BASE_FRAME* aFrame,
wxWindow* aParent ) : wxWindow* aParent ) :