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

Try to understand OSX crashing on context menu

Browse Source
This commit is contained in:
YuSanka 2018-08-28 17:03:40 +02:00
parent 5557e59d43
commit a56ea9a616
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xs/src/slic3r/GUI/GUI.cpp
View File

@ -1158,8 +1158,7 @@ void update_mode()
// *** Update showing of the collpane_settings // *** Update showing of the collpane_settings
// show_collpane_settings(mode == ConfigMenuModeExpert); // show_collpane_settings(mode == ConfigMenuModeExpert);
// ************************* // *************************
g_right_panel->GetParent()->Layout(); g_right_panel->GetParent()->GetParent()->Layout();
g_right_panel->Layout();
} }
bool is_expert_mode(){ bool is_expert_mode(){

9
xs/src/slic3r/GUI/GUI_ObjectParts.cpp
View File

@ -782,9 +782,14 @@ void object_ctrl_context_menu()
{ {
wxDataViewItem item; wxDataViewItem item;
wxDataViewColumn* col; wxDataViewColumn* col;
m_objects_ctrl->HitTest(get_mouse_position_in_control(), item, col); printf("object_ctrl_context_menu\n");
wxString title = col->GetTitle(); 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; if (!item) return;
printf("item exists\n");
const wxString title = col->GetTitle();
printf("title = *%s*\n", title.data().AsChar());
if (title == " ") if (title == " ")
show_context_menu(); show_context_menu();

2
xs/src/slic3r/GUI/OptionsGroup.cpp
View File

@ -189,7 +189,7 @@ void OptionsGroup::append_line(const Line& line, wxStaticText** colored_Label/*
// so we need a horizontal sizer to arrange these things // so we need a horizontal sizer to arrange these things
auto sizer = new wxBoxSizer(wxHORIZONTAL); auto sizer = new wxBoxSizer(wxHORIZONTAL);
grid_sizer->Add(sizer, 0, wxEXPAND | (staticbox ? wxALL : wxBOTTOM | wxTOP | wxLEFT), staticbox ? 0 : 1); 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) | sizer->Add(label, 0, (staticbox ? 0 : wxALIGN_RIGHT | wxRIGHT) |
(m_flag == ogSIDE_OPTIONS_VERTICAL ? wxTOP : wxALIGN_CENTER_VERTICAL), 5); (m_flag == ogSIDE_OPTIONS_VERTICAL ? wxTOP : wxALIGN_CENTER_VERTICAL), 5);
} }