From d56dced0aba993addf669d354c6ec1f883f295b1 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Wed, 6 May 2020 20:37:31 +0100
Subject: [PATCH] Fix dialog grow behaviour.

---
 .../dialogs/dialog_global_edit_text_and_graphics_base.cpp  | 1 +
 .../dialogs/dialog_global_edit_text_and_graphics_base.fbp  | 2 +-
 eeschema/dialogs/panel_eeschema_color_settings.cpp         | 7 -------
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp b/eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp
index 153d31a07d..1f46a35930 100644
--- a/eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp
+++ b/eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp
@@ -141,6 +141,7 @@ DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE::DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_
 
 	wxFlexGridSizer* fgSizer1;
 	fgSizer1 = new wxFlexGridSizer( 0, 6, 4, 0 );
+	fgSizer1->AddGrowableCol( 1 );
 	fgSizer1->AddGrowableCol( 3 );
 	fgSizer1->SetFlexibleDirection( wxBOTH );
 	fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
diff --git a/eeschema/dialogs/dialog_global_edit_text_and_graphics_base.fbp b/eeschema/dialogs/dialog_global_edit_text_and_graphics_base.fbp
index 95cc1149c0..739dead29c 100644
--- a/eeschema/dialogs/dialog_global_edit_text_and_graphics_base.fbp
+++ b/eeschema/dialogs/dialog_global_edit_text_and_graphics_base.fbp
@@ -1568,7 +1568,7 @@
                                         <object class="wxFlexGridSizer" expanded="1">
                                             <property name="cols">6</property>
                                             <property name="flexible_direction">wxBOTH</property>
-                                            <property name="growablecols">3</property>
+                                            <property name="growablecols">1,3</property>
                                             <property name="growablerows"></property>
                                             <property name="hgap">0</property>
                                             <property name="minimum_size"></property>
diff --git a/eeschema/dialogs/panel_eeschema_color_settings.cpp b/eeschema/dialogs/panel_eeschema_color_settings.cpp
index 66e35f8bf5..e6da365046 100644
--- a/eeschema/dialogs/panel_eeschema_color_settings.cpp
+++ b/eeschema/dialogs/panel_eeschema_color_settings.cpp
@@ -45,13 +45,6 @@
 #include <sch_base_frame.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,
                                                               wxWindow* aParent ) :