GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-16 11:05:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for #7270 - Feature Request: Right-click object table name-field should bring up context-menu - same as in 3D Editor View

Browse Source 
+ removed unused code
This commit is contained in:
YuSanka 2021-11-19 10:13:07 +01:00
parent f8e734cd79
commit 172b97cc2a
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/slic3r/GUI/GUI_ObjectList.cpp
View File

@ -913,18 +913,11 @@ void ObjectList::list_manipulation(const wxPoint& mouse_pos, bool evt_context_me
show_context_menu(evt_context_menu); show_context_menu(evt_context_menu);
else if (title == _("Name")) else if (title == _("Name"))
{ {
if (wxOSX) if (is_windows10() && m_objects_model->HasWarningIcon(item) &&
show_context_menu(evt_context_menu); // return context menu under OSX (related to #2909)
if (is_windows10())
{
int obj_idx, vol_idx;
get_selected_item_indexes(obj_idx, vol_idx, item);
if (m_objects_model->HasWarningIcon(item) &&
mouse_pos.x > 2 * wxGetApp().em_unit() && mouse_pos.x < 4 * wxGetApp().em_unit()) mouse_pos.x > 2 * wxGetApp().em_unit() && mouse_pos.x < 4 * wxGetApp().em_unit())
fix_through_netfabb(); fix_through_netfabb();
} else
show_context_menu(evt_context_menu); // show context menu for "Name" column too
} }
// workaround for extruder editing under OSX // workaround for extruder editing under OSX
else if (wxOSX && evt_context_menu && title == _("Extruder")) else if (wxOSX && evt_context_menu && title == _("Extruder"))