diff --git a/lib/Slic3r/GUI.pm b/lib/Slic3r/GUI.pm index 34e8cd1ba0..ab0f83049b 100644 --- a/lib/Slic3r/GUI.pm +++ b/lib/Slic3r/GUI.pm @@ -17,7 +17,7 @@ my $growler; our $datadir; our $small_font = Wx::SystemSettings::GetFont(&Wx::wxSYS_DEFAULT_GUI_FONT); -$small_font->SetPointSize(11); +$small_font->SetPointSize(11) if !&Wx::wxMSW; our $medium_font = Wx::SystemSettings::GetFont(&Wx::wxSYS_DEFAULT_GUI_FONT); $medium_font->SetPointSize(12); diff --git a/lib/Slic3r/GUI/OptionsGroup.pm b/lib/Slic3r/GUI/OptionsGroup.pm index c0c1d22d7f..acfb6b8cb9 100644 --- a/lib/Slic3r/GUI/OptionsGroup.pm +++ b/lib/Slic3r/GUI/OptionsGroup.pm @@ -26,7 +26,6 @@ sub new { my $bold_font = Wx::SystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); $bold_font->SetWeight(&Wx::wxFONTWEIGHT_BOLD); my $sidetext_font = Wx::SystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); - $sidetext_font->SetPointSize(12); my $onChange = $p{on_change} || sub {}; diff --git a/lib/Slic3r/GUI/Plater.pm b/lib/Slic3r/GUI/Plater.pm index d52dd5df2d..fdc6315ea9 100644 --- a/lib/Slic3r/GUI/Plater.pm +++ b/lib/Slic3r/GUI/Plater.pm @@ -206,10 +206,9 @@ sub new { $self->{preset_choosers} = {}; for my $group (qw(print filament printer)) { my $text = Wx::StaticText->new($self, -1, "$group_labels{$group}:", [-1, -1], [-1, -1], wxALIGN_RIGHT); - $text->SetFont($Slic3r::GUI::medium_font); $self->{preset_choosers}{$group} = Wx::Choice->new($self, -1, [-1, -1], [-1, -1], []); - $presets->Add($text, 1, wxALIGN_RIGHT | wxRIGHT, 4); - $presets->Add($self->{preset_choosers}{$group}, 2, wxRIGHT, 15); + $presets->Add($text, 1, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxRIGHT, 4); + $presets->Add($self->{preset_choosers}{$group}, 2, wxALIGN_CENTER_VERTICAL | wxRIGHT, 15); } my $sizer = Wx::BoxSizer->new(wxVERTICAL); diff --git a/lib/Slic3r/GUI/Tab.pm b/lib/Slic3r/GUI/Tab.pm index 2bcafa562f..855eb0dc28 100644 --- a/lib/Slic3r/GUI/Tab.pm +++ b/lib/Slic3r/GUI/Tab.pm @@ -183,12 +183,14 @@ sub set_dirty { $self->{btn_save_preset}->Enable; if ($text !~ / \(modified\)$/) { $self->{presets_choice}->SetString($i, "$text (modified)"); + $self->{presets_choice}->SetSelection($i); # wxMSW needs this after every SetString() } } else { $self->{dirty} = undef; $self->{btn_save_preset}->Disable; $text =~ s/ \(modified\)$//; $self->{presets_choice}->SetString($i, $text); + $self->{presets_choice}->SetSelection($i); # wxMSW needs this after every SetString() } $self->sync_presets; }