From 617fbaa9bd8902b1bc4c22a6f52815ee80666be6 Mon Sep 17 00:00:00 2001
From: Alessandro Ranellucci <aar@cpan.org>
Date: Thu, 25 Dec 2014 19:14:18 +0100
Subject: [PATCH] Restore expansion of filament choosers

---
 lib/Slic3r/GUI/Plater.pm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/Slic3r/GUI/Plater.pm b/lib/Slic3r/GUI/Plater.pm
index 0ee13ee38..445e5784c 100644
--- a/lib/Slic3r/GUI/Plater.pm
+++ b/lib/Slic3r/GUI/Plater.pm
@@ -291,7 +291,7 @@ sub new {
     {
         my $presets;
         if ($self->GetFrame->{mode} eq 'expert') {
-            $presets = Wx::FlexGridSizer->new(3, 2, 1, 2);
+            $presets = $self->{presets_sizer} = Wx::FlexGridSizer->new(3, 2, 1, 2);
             $presets->AddGrowableCol(1, 1);
             $presets->SetFlexibleDirection(wxHORIZONTAL);
             my %group_labels = (
@@ -1183,13 +1183,15 @@ sub on_extruders_change {
         my @presets = $choices->[0]->GetStrings;
         push @$choices, Wx::Choice->new($self, -1, wxDefaultPosition, [150, -1], [@presets]);
         $choices->[-1]->SetFont($Slic3r::GUI::small_font);
-        $self->{preset_choosers_sizers}{filament}->Add($choices->[-1], 0, wxEXPAND | wxBOTTOM, FILAMENT_CHOOSERS_SPACING);
+        $self->{presets_sizer}->Insert(4 + ($#$choices-1)*2, 0, 0);
+        $self->{presets_sizer}->Insert(5 + ($#$choices-1)*2, $choices->[-1], 0, wxEXPAND | wxBOTTOM, FILAMENT_CHOOSERS_SPACING);
         EVT_CHOICE($choices->[-1], $choices->[-1], sub { $self->_on_select_preset('filament', @_) });
         my $i = first { $choices->[-1]->GetString($_) eq ($Slic3r::GUI::Settings->{presets}{"filament_" . $#$choices} || '') } 0 .. $#presets;
         $choices->[-1]->SetSelection($i || 0);
     }
     while (@$choices > $num_extruders) {
-        $self->{preset_choosers_sizers}{filament}->Remove(-1);
+        $self->{presets_sizer}->Remove(4 + ($#$choices-1)*2);  # label
+        $self->{presets_sizer}->Remove(4 + ($#$choices-1)*2);  # wxChoice
         $choices->[-1]->Destroy;
         pop @$choices;
     }