mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-16 10:02:12 +00:00
FIX: enhance filament_map auto manual behavior
1. auto mode dragdrop is not allowed 2. not display filament_map when there is no result in auto mode jira:none Change-Id: I0800e0d832e27fe459a17bb1aa829b5e72d0ee8f (cherry picked from commit 9ee85bef34aaabe7a4cef251f07e77f9af693a2f)
This commit is contained in:
@@ -171,8 +171,9 @@ wxDragResult ColorDropTarget::OnData(wxCoord x, wxCoord y, wxDragResult def)
|
||||
/////////////// ColorDropTarget end ////////////////////////
|
||||
|
||||
|
||||
DragDropPanel::DragDropPanel(wxWindow *parent, const wxString &label)
|
||||
DragDropPanel::DragDropPanel(wxWindow *parent, const wxString &label, bool is_auto)
|
||||
: wxPanel(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_SIMPLE)
|
||||
, m_is_auto(is_auto)
|
||||
{
|
||||
SetBackgroundColour(*wxLIGHT_GREY);
|
||||
|
||||
@@ -209,6 +210,9 @@ void DragDropPanel::RemoveColorBlock(ColorPanel *panel)
|
||||
|
||||
void DragDropPanel::DoDragDrop(ColorPanel *panel, const wxColour &color, int filament_id)
|
||||
{
|
||||
if (m_is_auto)
|
||||
return;
|
||||
|
||||
ColorDropSource source(this, panel, color, filament_id);
|
||||
source.DoDragDrop(wxDrag_CopyOnly);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user