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

Try to fix OSX crashing on UnselectAll

Browse source
This commit is contained in:
YuSanka 2018-08-14 14:13:07 +02:00
parent acac6b0b44
commit a2eff85fa8
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2223,7 +2223,7 @@ sub selection_changed {
$self->Layout; $self->Layout;
} }
print "selection_changed -> have_sel = $have_sel\n"; #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);

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

@ -287,14 +287,16 @@ wxBoxSizer* content_objects_list(wxWindow *win)
m_objects_ctrl->Bind(wxEVT_CHAR, [](wxKeyEvent& event) m_objects_ctrl->Bind(wxEVT_CHAR, [](wxKeyEvent& event)
{ {
printf("wxEVT_CHAR : ");
if (event.GetKeyCode() == WXK_TAB) if (event.GetKeyCode() == WXK_TAB)
m_objects_ctrl->Navigate(event.ShiftDown() ? wxNavigationKeyEvent::IsBackward : wxNavigationKeyEvent::IsForward); m_objects_ctrl->Navigate(event.ShiftDown() ? wxNavigationKeyEvent::IsBackward : wxNavigationKeyEvent::IsForward);
else if (event.GetKeyCode() == WXK_DELETE else if (event.GetKeyCode() == WXK_DELETE
#ifdef __WXOSX__ #ifdef __WXOSX__
|| event.GetKeyCode() == WXK_BACK || event.GetKeyCode() == WXK_BACK
#endif //__WXOSX__ #endif //__WXOSX__
) ){
remove(); printf("WXK_BACK\n");
remove();}
else else
event.Skip(); event.Skip();
}); });
@ -729,8 +731,10 @@ void unselect_objects()
{ {
printf("UNSELECT OBJECTS\n"); printf("UNSELECT OBJECTS\n");
g_prevent_list_events = true; g_prevent_list_events = true;
m_objects_ctrl->UnselectAll(); if (m_objects_ctrl->GetSelection())
// part_selection_changed(); m_objects_ctrl->UnselectAll();
else
printf("all items are UNSELECTED\n");
g_prevent_list_events = false; g_prevent_list_events = false;
get_optgroup(ogFrequentlyObjectSettings)->disable(); get_optgroup(ogFrequentlyObjectSettings)->disable();
@ -774,11 +778,9 @@ void object_ctrl_selection_changed()
part_selection_changed(); part_selection_changed();
// if (m_selected_object_id < 0) return;
if (m_event_object_selection_changed > 0) { if (m_event_object_selection_changed > 0) {
wxCommandEvent event(m_event_object_selection_changed); wxCommandEvent event(m_event_object_selection_changed);
event.SetInt(int(m_objects_model->GetParent(/*item*/ m_objects_ctrl->GetSelection()) != wxDataViewItem(0))); event.SetInt(int(m_objects_model->GetParent(m_objects_ctrl->GetSelection()) != wxDataViewItem(0)));
event.SetId(m_selected_object_id); event.SetId(m_selected_object_id);
get_main_frame()->ProcessWindowEvent(event); get_main_frame()->ProcessWindowEvent(event);
} }