3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fry to fix OSX-crashing on UnselectAll

Browse source
This commit is contained in:
YuSanka 2018-08-10 14:02:47 +02:00
parent 0477d4d802
commit 4b8d7bd7fa
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2222,6 +2222,8 @@ sub selection_changed {
} }
$self->Layout; $self->Layout;
} }
print "selection_changed -> have_sel = $have_sel\n";
# prepagate the event to the frame (a custom Wx event would be cleaner) # prepagate the event to the frame (a custom Wx event would be cleaner)
$self->GetFrame->on_plater_selection_changed($have_sel); $self->GetFrame->on_plater_selection_changed($have_sel);

8
xs/src/slic3r/GUI/GUI_ObjectParts.cpp
View file

@ -279,6 +279,9 @@ wxBoxSizer* content_objects_list(wxWindow *win)
// if (is_windows10()) // if (is_windows10())
// fix_through_netfabb(); // fix_through_netfabb();
// } // }
#ifndef __WXMSW__
m_objects_ctrl->GetMainWindow()->SetToolTip(""); // hide tooltip
#endif //__WXMSW__
event.Skip(); event.Skip();
}); });
@ -721,8 +724,10 @@ void set_object_scale(int idx, int scale)
void unselect_objects() void unselect_objects()
{ {
printf("UNSELECT OBJECTS\n"); printf("UNSELECT OBJECTS\n");
g_prevent_list_events = true;
m_objects_ctrl->UnselectAll(); m_objects_ctrl->UnselectAll();
part_selection_changed(); part_selection_changed();
g_prevent_list_events = false;
get_optgroup(ogFrequentlyObjectSettings)->disable(); get_optgroup(ogFrequentlyObjectSettings)->disable();
} }
@ -1310,9 +1315,7 @@ void parts_changed(int obj_idx)
void update_settings_value() void update_settings_value()
{ {
printf("update_settings_value\n");
auto og = get_optgroup(ogFrequentlyObjectSettings); auto og = get_optgroup(ogFrequentlyObjectSettings);
printf("selected_object_id = %d\n", m_selected_object_id);
if (m_selected_object_id < 0 || m_objects->size() <= m_selected_object_id) { if (m_selected_object_id < 0 || m_objects->size() <= m_selected_object_id) {
og->set_value("scale_x", 0); og->set_value("scale_x", 0);
og->set_value("scale_y", 0); og->set_value("scale_y", 0);
@ -1327,7 +1330,6 @@ void update_settings_value()
void part_selection_changed() void part_selection_changed()
{ {
printf("part_selection_changed\n");
auto item = m_objects_ctrl->GetSelection(); auto item = m_objects_ctrl->GetSelection();
int obj_idx = -1; int obj_idx = -1;
auto og = get_optgroup(ogFrequentlyObjectSettings); auto og = get_optgroup(ogFrequentlyObjectSettings);