From 8ccf3cbd7c183a06ea021c53669a8ef9a55e4fb4 Mon Sep 17 00:00:00 2001 From: tao wang Date: Fri, 16 Dec 2022 09:45:10 +0800 Subject: [PATCH] FIX:fixed can not change filaments on objecttable Change-Id: Ic4a301a71af1406f02075edaf9ef24a273c82105 --- src/slic3r/GUI/GUI_ObjectTable.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/slic3r/GUI/GUI_ObjectTable.cpp b/src/slic3r/GUI/GUI_ObjectTable.cpp index 79628e2222..06eeefc65a 100644 --- a/src/slic3r/GUI/GUI_ObjectTable.cpp +++ b/src/slic3r/GUI/GUI_ObjectTable.cpp @@ -171,6 +171,16 @@ void GridCellFilamentsEditor::Create(wxWindow* parent, } m_control = bitmap_combo; wxGridCellEditor::Create(parent, id, evtHandler); + + /* bitmap_combo->GetDropDown().Bind(wxEVT_COMBOBOX, [this](wxCommandEvent& e) { + const wxString value = Combo()->GetValue(); + if (value == m_value) + return false; + + m_value = value; + return true; + e.Skip(); + });*/ } void GridCellFilamentsEditor::SetSize(const wxRect& rect) @@ -242,7 +252,7 @@ void GridCellFilamentsEditor::BeginEdit(int row, int col, wxGrid* grid) // When dropping down the menu, a kill focus event // happens after this point, so we can't reset the flag yet. #if !defined(__WXGTK20__) - evtHandler->SetInSetFocus(false); + //evtHandler->SetInSetFocus(false); #endif } }