From a56ea9a6166a5b20b963b55ccf641fed951f80ad Mon Sep 17 00:00:00 2001 From: YuSanka Date: Tue, 28 Aug 2018 17:03:40 +0200 Subject: [PATCH] Try to understand OSX crashing on context menu --- xs/src/slic3r/GUI/GUI.cpp | 3 +-- xs/src/slic3r/GUI/GUI_ObjectParts.cpp | 9 +++++++-- xs/src/slic3r/GUI/OptionsGroup.cpp | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/xs/src/slic3r/GUI/GUI.cpp b/xs/src/slic3r/GUI/GUI.cpp index ee12e0492..e559a1d4b 100644 --- a/xs/src/slic3r/GUI/GUI.cpp +++ b/xs/src/slic3r/GUI/GUI.cpp @@ -1158,8 +1158,7 @@ void update_mode() // *** Update showing of the collpane_settings // show_collpane_settings(mode == ConfigMenuModeExpert); // ************************* - g_right_panel->GetParent()->Layout(); - g_right_panel->Layout(); + g_right_panel->GetParent()->GetParent()->Layout(); } bool is_expert_mode(){ diff --git a/xs/src/slic3r/GUI/GUI_ObjectParts.cpp b/xs/src/slic3r/GUI/GUI_ObjectParts.cpp index f6d9ad3c2..158ad021c 100644 --- a/xs/src/slic3r/GUI/GUI_ObjectParts.cpp +++ b/xs/src/slic3r/GUI/GUI_ObjectParts.cpp @@ -782,9 +782,14 @@ void object_ctrl_context_menu() { wxDataViewItem item; wxDataViewColumn* col; - m_objects_ctrl->HitTest(get_mouse_position_in_control(), item, col); - wxString title = col->GetTitle(); + printf("object_ctrl_context_menu\n"); + const wxPoint pt = get_mouse_position_in_control(); + printf("mouse_position_in_control: x = %d, y = %d\n", pt.x, pt.y); + m_objects_ctrl->HitTest(pt, item, col); if (!item) return; + printf("item exists\n"); + const wxString title = col->GetTitle(); + printf("title = *%s*\n", title.data().AsChar()); if (title == " ") show_context_menu(); diff --git a/xs/src/slic3r/GUI/OptionsGroup.cpp b/xs/src/slic3r/GUI/OptionsGroup.cpp index 52485599e..339c7358f 100644 --- a/xs/src/slic3r/GUI/OptionsGroup.cpp +++ b/xs/src/slic3r/GUI/OptionsGroup.cpp @@ -189,7 +189,7 @@ void OptionsGroup::append_line(const Line& line, wxStaticText** colored_Label/* // so we need a horizontal sizer to arrange these things auto sizer = new wxBoxSizer(wxHORIZONTAL); grid_sizer->Add(sizer, 0, wxEXPAND | (staticbox ? wxALL : wxBOTTOM | wxTOP | wxLEFT), staticbox ? 0 : 1); - sizer->Add(line.near_label_widget(parent()), 0, wxRIGHT, 2); + sizer->Add(line.near_label_widget(parent()), 0, wxRIGHT, 7); sizer->Add(label, 0, (staticbox ? 0 : wxALIGN_RIGHT | wxRIGHT) | (m_flag == ogSIDE_OPTIONS_VERTICAL ? wxTOP : wxALIGN_CENTER_VERTICAL), 5); }