mirror of
https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git
synced 2025-05-05 06:04:02 +08:00
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
This commit is contained in:
commit
ee4f95bce5
@ -495,6 +495,7 @@ sub new {
|
|||||||
$scrolled_window_sizer->Add($print_info_sizer, 0, wxEXPAND, 0);
|
$scrolled_window_sizer->Add($print_info_sizer, 0, wxEXPAND, 0);
|
||||||
|
|
||||||
my $right_sizer = Wx::BoxSizer->new(wxVERTICAL);
|
my $right_sizer = Wx::BoxSizer->new(wxVERTICAL);
|
||||||
|
$right_sizer->SetMinSize([320,-1]);
|
||||||
$right_sizer->Add($presets, 0, wxEXPAND | wxTOP, 10) if defined $presets;
|
$right_sizer->Add($presets, 0, wxEXPAND | wxTOP, 10) if defined $presets;
|
||||||
$right_sizer->Add($frequently_changed_parameters_sizer, 0, wxEXPAND | wxTOP, 0) if defined $frequently_changed_parameters_sizer;
|
$right_sizer->Add($frequently_changed_parameters_sizer, 0, wxEXPAND | wxTOP, 0) if defined $frequently_changed_parameters_sizer;
|
||||||
$right_sizer->Add($buttons_sizer, 0, wxEXPAND | wxBOTTOM, 5);
|
$right_sizer->Add($buttons_sizer, 0, wxEXPAND | wxBOTTOM, 5);
|
||||||
@ -2012,6 +2013,8 @@ sub selection_changed {
|
|||||||
} else {
|
} else {
|
||||||
$self->{object_info_manifold}->SetLabel(L("Yes"));
|
$self->{object_info_manifold}->SetLabel(L("Yes"));
|
||||||
$self->{object_info_manifold_warning_icon}->Hide;
|
$self->{object_info_manifold_warning_icon}->Hide;
|
||||||
|
$self->{object_info_manifold}->SetToolTipString("");
|
||||||
|
$self->{object_info_manifold_warning_icon}->SetToolTipString("");
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$self->{object_info_facets}->SetLabel($object->facets);
|
$self->{object_info_facets}->SetLabel($object->facets);
|
||||||
@ -2020,6 +2023,7 @@ sub selection_changed {
|
|||||||
$self->{"object_info_$_"}->SetLabel("") for qw(size volume facets materials manifold);
|
$self->{"object_info_$_"}->SetLabel("") for qw(size volume facets materials manifold);
|
||||||
$self->{object_info_manifold_warning_icon}->Hide;
|
$self->{object_info_manifold_warning_icon}->Hide;
|
||||||
$self->{object_info_manifold}->SetToolTipString("");
|
$self->{object_info_manifold}->SetToolTipString("");
|
||||||
|
$self->{object_info_manifold_warning_icon}->SetToolTipString("");
|
||||||
}
|
}
|
||||||
$self->Layout;
|
$self->Layout;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user