3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-12 09:17:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed OSX compilation bug

Browse source 
Changed info_box (more place to the manifold information)
This commit is contained in:
YuSanka 2018-06-07 11:54:42 +02:00
parent b31e696edc
commit 49f0a1a824
2 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/Slic3r/GUI/Plater.pm
View file

@ -412,7 +412,8 @@ sub new {
$box->SetFont($Slic3r::GUI::small_bold_font); $box->SetFont($Slic3r::GUI::small_bold_font);
$object_info_sizer = Wx::StaticBoxSizer->new($box, wxVERTICAL); $object_info_sizer = Wx::StaticBoxSizer->new($box, wxVERTICAL);
$object_info_sizer->SetMinSize([300,-1]); $object_info_sizer->SetMinSize([300,-1]);
my $grid_sizer = Wx::FlexGridSizer->new(3, 4, 5, 5); #!my $grid_sizer = Wx::FlexGridSizer->new(3, 4, 5, 5);
my $grid_sizer = Wx::FlexGridSizer->new(2, 4, 5, 5);
$grid_sizer->SetFlexibleDirection(wxHORIZONTAL); $grid_sizer->SetFlexibleDirection(wxHORIZONTAL);
$grid_sizer->AddGrowableCol(1, 1); $grid_sizer->AddGrowableCol(1, 1);
$grid_sizer->AddGrowableCol(3, 1); $grid_sizer->AddGrowableCol(3, 1);
@ -429,7 +430,7 @@ sub new {
my $label = shift @info; my $label = shift @info;
my $text = Wx::StaticText->new($self->{right_panel}, -1, "$label:", wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT); my $text = Wx::StaticText->new($self->{right_panel}, -1, "$label:", wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT);
$text->SetFont($Slic3r::GUI::small_font); $text->SetFont($Slic3r::GUI::small_font);
$grid_sizer->Add($text, 0); #!$grid_sizer->Add($text, 0);
$self->{"object_info_$field"} = Wx::StaticText->new($self->{right_panel}, -1, "", wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT); $self->{"object_info_$field"} = Wx::StaticText->new($self->{right_panel}, -1, "", wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT);
$self->{"object_info_$field"}->SetFont($Slic3r::GUI::small_font); $self->{"object_info_$field"}->SetFont($Slic3r::GUI::small_font);
@ -448,10 +449,13 @@ sub new {
$self->{"object_info_manifold_warning_icon_show"}->(0); $self->{"object_info_manifold_warning_icon_show"}->(0);
my $h_sizer = Wx::BoxSizer->new(wxHORIZONTAL); my $h_sizer = Wx::BoxSizer->new(wxHORIZONTAL);
$h_sizer->Add($self->{object_info_manifold_warning_icon}, 0); $h_sizer->Add($text, 0);
$h_sizer->Add($self->{"object_info_$field"}, 0); $h_sizer->Add($self->{object_info_manifold_warning_icon}, 0, wxLEFT, 2);
$grid_sizer->Add($h_sizer, 0, wxEXPAND); $h_sizer->Add($self->{"object_info_$field"}, 0, wxLEFT, 2);
#!$grid_sizer->Add($h_sizer, 0, wxEXPAND);
$object_info_sizer->Add($h_sizer, 0, wxEXPAND|wxTOP, 4);
} else { } else {
$grid_sizer->Add($text, 0);
$grid_sizer->Add($self->{"object_info_$field"}, 0); $grid_sizer->Add($self->{"object_info_$field"}, 0);
} }
} }

6
xs/src/slic3r/GUI/GUI.cpp
View file

@ -907,8 +907,10 @@ wxBoxSizer* content_objects_list(wxWindow *win)
{ {
if (m_objects_model->GetParent(item) == wxDataViewItem(0)) if (m_objects_model->GetParent(item) == wxDataViewItem(0))
obj_idx = m_objects_model->GetIdByItem(item); obj_idx = m_objects_model->GetIdByItem(item);
else else {
obj_idx = m_objects_model->GetIdByItem(m_objects_model->GetParent(item)); // TODO Temporary decision for sub-objects selection auto parent = m_objects_model->GetParent(item);
obj_idx = m_objects_model->GetIdByItem(parent); // TODO Temporary decision for sub-objects selection
}
} }
if (m_event_object_selection_changed > 0) { if (m_event_object_selection_changed > 0) {