amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Try to fix the circular event handling Select() on OSX

Browse source
This commit is contained in:
YuSanka 2018-06-08 09:03:46 +02:00
parent e2a7bd4a14
commit 7ba2093a9b
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -142,6 +142,9 @@ wxDataViewCtrl *m_objects_ctrl = nullptr;
MyObjectTreeModel *m_objects_model = nullptr; MyObjectTreeModel *m_objects_model = nullptr;
wxCollapsiblePane *m_collpane_settings = nullptr; wxCollapsiblePane *m_collpane_settings = nullptr;
int m_event_object_selection_changed = 0; int m_event_object_selection_changed = 0;
bool g_prevent_list_events = false; // We use this flag to avoid circular event handling Select()
// happens to fire a wxEVT_LIST_ITEM_SELECTED on OSX, whose event handler
// calls this method again and again and again
wxFont g_small_font; wxFont g_small_font;
wxFont g_bold_font; wxFont g_bold_font;
@ -898,6 +901,8 @@ wxBoxSizer* content_objects_list(wxWindow *win)
m_objects_ctrl->Bind(wxEVT_DATAVIEW_SELECTION_CHANGED, [](wxEvent& event) m_objects_ctrl->Bind(wxEVT_DATAVIEW_SELECTION_CHANGED, [](wxEvent& event)
{ {
if (g_prevent_list_events) return;
wxWindowUpdateLocker noUpdates(g_right_panel); wxWindowUpdateLocker noUpdates(g_right_panel);
auto item = m_objects_ctrl->GetSelection(); auto item = m_objects_ctrl->GetSelection();
int obj_idx = -1; int obj_idx = -1;
@ -1129,10 +1134,15 @@ void unselect_objects()
void select_current_object(int idx) void select_current_object(int idx)
{ {
wxMessageBox("Inside select_current_object", "Info"); wxMessageBox("Inside select_current_object", "Info");
g_prevent_list_events = true;
m_objects_ctrl->UnselectAll(); m_objects_ctrl->UnselectAll();
wxMessageBox("UnselectAll", "Info"); wxMessageBox("UnselectAll", "Info");
if (idx < 0) return; if (idx < 0) {
g_prevent_list_events = false;
return;
}
m_objects_ctrl->Select(m_objects_model->GetItemById(idx)); m_objects_ctrl->Select(m_objects_model->GetItemById(idx));
g_prevent_list_events = false;
wxMessageBox("Item is selected", "Info"); wxMessageBox("Item is selected", "Info");
if (get_view_mode() == ConfigMenuModeExpert){ if (get_view_mode() == ConfigMenuModeExpert){