mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-12 01:07:57 -06:00
Fixes for Windows
This commit is contained in:
parent
8d465aca34
commit
ac59297e39
4 changed files with 5 additions and 5 deletions
|
@ -17,7 +17,7 @@ my $growler;
|
||||||
our $datadir;
|
our $datadir;
|
||||||
|
|
||||||
our $small_font = Wx::SystemSettings::GetFont(&Wx::wxSYS_DEFAULT_GUI_FONT);
|
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);
|
our $medium_font = Wx::SystemSettings::GetFont(&Wx::wxSYS_DEFAULT_GUI_FONT);
|
||||||
$medium_font->SetPointSize(12);
|
$medium_font->SetPointSize(12);
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,6 @@ sub new {
|
||||||
my $bold_font = Wx::SystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
|
my $bold_font = Wx::SystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
|
||||||
$bold_font->SetWeight(&Wx::wxFONTWEIGHT_BOLD);
|
$bold_font->SetWeight(&Wx::wxFONTWEIGHT_BOLD);
|
||||||
my $sidetext_font = Wx::SystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
|
my $sidetext_font = Wx::SystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
|
||||||
$sidetext_font->SetPointSize(12);
|
|
||||||
|
|
||||||
my $onChange = $p{on_change} || sub {};
|
my $onChange = $p{on_change} || sub {};
|
||||||
|
|
||||||
|
|
|
@ -206,10 +206,9 @@ sub new {
|
||||||
$self->{preset_choosers} = {};
|
$self->{preset_choosers} = {};
|
||||||
for my $group (qw(print filament printer)) {
|
for my $group (qw(print filament printer)) {
|
||||||
my $text = Wx::StaticText->new($self, -1, "$group_labels{$group}:", [-1, -1], [-1, -1], wxALIGN_RIGHT);
|
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], []);
|
$self->{preset_choosers}{$group} = Wx::Choice->new($self, -1, [-1, -1], [-1, -1], []);
|
||||||
$presets->Add($text, 1, wxALIGN_RIGHT | wxRIGHT, 4);
|
$presets->Add($text, 1, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxRIGHT, 4);
|
||||||
$presets->Add($self->{preset_choosers}{$group}, 2, wxRIGHT, 15);
|
$presets->Add($self->{preset_choosers}{$group}, 2, wxALIGN_CENTER_VERTICAL | wxRIGHT, 15);
|
||||||
}
|
}
|
||||||
|
|
||||||
my $sizer = Wx::BoxSizer->new(wxVERTICAL);
|
my $sizer = Wx::BoxSizer->new(wxVERTICAL);
|
||||||
|
|
|
@ -183,12 +183,14 @@ sub set_dirty {
|
||||||
$self->{btn_save_preset}->Enable;
|
$self->{btn_save_preset}->Enable;
|
||||||
if ($text !~ / \(modified\)$/) {
|
if ($text !~ / \(modified\)$/) {
|
||||||
$self->{presets_choice}->SetString($i, "$text (modified)");
|
$self->{presets_choice}->SetString($i, "$text (modified)");
|
||||||
|
$self->{presets_choice}->SetSelection($i); # wxMSW needs this after every SetString()
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$self->{dirty} = undef;
|
$self->{dirty} = undef;
|
||||||
$self->{btn_save_preset}->Disable;
|
$self->{btn_save_preset}->Disable;
|
||||||
$text =~ s/ \(modified\)$//;
|
$text =~ s/ \(modified\)$//;
|
||||||
$self->{presets_choice}->SetString($i, $text);
|
$self->{presets_choice}->SetString($i, $text);
|
||||||
|
$self->{presets_choice}->SetSelection($i); # wxMSW needs this after every SetString()
|
||||||
}
|
}
|
||||||
$self->sync_presets;
|
$self->sync_presets;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue