From 49f0a1a824173b9615e9f98053b35f95528e42e0 Mon Sep 17 00:00:00 2001
From: YuSanka <yusanka@gmail.com>
Date: Thu, 7 Jun 2018 11:54:42 +0200
Subject: [PATCH] Fixed OSX compilation bug
Changed info_box (more place to the manifold information)
---
lib/Slic3r/GUI/Plater.pm | 14 +++++++++-----
xs/src/slic3r/GUI/GUI.cpp | 6 ++++--
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/lib/Slic3r/GUI/Plater.pm b/lib/Slic3r/GUI/Plater.pm
index 58673937e..689ccff28 100644
--- a/lib/Slic3r/GUI/Plater.pm
+++ b/lib/Slic3r/GUI/Plater.pm
@@ -412,7 +412,8 @@ sub new {
$box->SetFont($Slic3r::GUI::small_bold_font);
$object_info_sizer = Wx::StaticBoxSizer->new($box, wxVERTICAL);
$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->AddGrowableCol(1, 1);
$grid_sizer->AddGrowableCol(3, 1);
@@ -429,7 +430,7 @@ sub new {
my $label = shift @info;
my $text = Wx::StaticText->new($self->{right_panel}, -1, "$label:", wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT);
$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"}->SetFont($Slic3r::GUI::small_font);
@@ -448,10 +449,13 @@ sub new {
$self->{"object_info_manifold_warning_icon_show"}->(0);
my $h_sizer = Wx::BoxSizer->new(wxHORIZONTAL);
- $h_sizer->Add($self->{object_info_manifold_warning_icon}, 0);
- $h_sizer->Add($self->{"object_info_$field"}, 0);
- $grid_sizer->Add($h_sizer, 0, wxEXPAND);
+ $h_sizer->Add($text, 0);
+ $h_sizer->Add($self->{object_info_manifold_warning_icon}, 0, wxLEFT, 2);
+ $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 {
+ $grid_sizer->Add($text, 0);
$grid_sizer->Add($self->{"object_info_$field"}, 0);
}
}
diff --git a/xs/src/slic3r/GUI/GUI.cpp b/xs/src/slic3r/GUI/GUI.cpp
index 2e27efcdd..d2bcc7b58 100644
--- a/xs/src/slic3r/GUI/GUI.cpp
+++ b/xs/src/slic3r/GUI/GUI.cpp
@@ -907,8 +907,10 @@ wxBoxSizer* content_objects_list(wxWindow *win)
{
if (m_objects_model->GetParent(item) == wxDataViewItem(0))
obj_idx = m_objects_model->GetIdByItem(item);
- else
- obj_idx = m_objects_model->GetIdByItem(m_objects_model->GetParent(item)); // TODO Temporary decision for sub-objects selection
+ else {
+ 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) {