mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH:Improving the AMS display of empty disks 

It is difficult to distinguish between blank and empty thumbnails, so adding a diagonal line on the empty disk indicates empty

JIRA:STUDIO-4515

Change-Id: I46038c9256fc43927976b82f29ea895ce907d247
This commit is contained in:
hu.wang 2023-08-04 09:22:32 +08:00 committed by Lane.Wei
parent a518467c23
commit d98e788847
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/slic3r/GUI/Widgets/AMSControl.cpp
View File

@ -1299,7 +1299,6 @@ AMSRoad::AMSRoad(wxWindow *parent, wxWindowID id, Caninfo info, int canindex, in
wxPostEvent(GetParent()->GetParent(), close_event); wxPostEvent(GetParent()->GetParent(), close_event);
#endif // __WXMSW__ #endif // __WXMSW__
} }
} }
}); });
@ -1666,7 +1665,16 @@ void AMSItem::doRender(wxDC &dc)
dc.DrawBitmap(m_ts_bitmap_cube->bmp(),left,(size.y - AMS_ITEM_CUBE_SIZE.y) / 2); dc.DrawBitmap(m_ts_bitmap_cube->bmp(),left,(size.y - AMS_ITEM_CUBE_SIZE.y) / 2);
} }
else { else {
dc.DrawRoundedRectangle(left, (size.y - AMS_ITEM_CUBE_SIZE.y) / 2, AMS_ITEM_CUBE_SIZE.x, AMS_ITEM_CUBE_SIZE.y, 2); wxRect rect(left, (size.y - AMS_ITEM_CUBE_SIZE.y) / 2, AMS_ITEM_CUBE_SIZE.x, AMS_ITEM_CUBE_SIZE.y);
if(iter->material_state==AMSCanType::AMS_CAN_TYPE_EMPTY){
dc.SetPen(wxPen(wxColor(0, 0, 0)));
dc.DrawRoundedRectangle(rect, 2);
dc.DrawLine(rect.GetRight()-1, rect.GetTop()+1, rect.GetLeft()+1, rect.GetBottom()-1);
}
else {
dc.DrawRoundedRectangle(rect, 2);
}
} }
} }