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

FIX: ams count dialog not default button 

Change-Id: I5eb563d734953d185425f745acac3cfb3eadb4a4
Jira: STUDIO-9936
This commit is contained in:
chunmao.guo 2025-01-17 16:11:04 +08:00 committed by lane.wei
parent 3213963399
commit a5acf20506
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/images/badge.svg
View File

@ -1,4 +1,4 @@
<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M0 0H14C16.2091 0 18 1.79086 18 4V18L8.2784 8.45085L0 0Z" fill="#ACACAC"/>
<path d="M0 0H14C16.2091 0 18 1.79086 18 4V18L8.2784 8.45085L0 0Z" fill="#00AE42"/>
<path d="M16.3579 3.1416C16.5467 3.3304 16.5467 3.63568 16.3579 3.82247L11.0555 9.12687C10.8667 9.31567 10.5614 9.31567 10.3747 9.12687L7.64111 6.39534C7.45231 6.20654 7.45231 5.90125 7.64111 5.71446C7.82991 5.52767 8.1352 5.52566 8.32198 5.71446L10.7121 8.10455L15.675 3.1416C15.8638 2.9528 16.1691 2.9528 16.3559 3.1416H16.3579Z" fill="white"/>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 534 B

After

Width:  |  Height:  |  Size: 534 B

6
src/slic3r/GUI/Plater.cpp
View File

@ -1099,11 +1099,11 @@ bool Sidebar::priv::switch_diameter(bool single)
_L("The software does not support using different diameter of nozzles for one print. "
"If the left and right nozzles are inconsistent, we can only proceed with single-head printing. "
"Please confirm which nozzle you would like to use for this project."),
_L("Switch diameter"), wxYES_NO | wxNO_DEFAULT);
dlg.SetButtonLabel(wxID_YES, wxString::Format(_L("Left nozzle: %smm"), diameter_left));
_L("Switch diameter"), wxNO | wxCANCEL);
dlg.SetButtonLabel(wxID_CANCEL, wxString::Format(_L("Left nozzle: %smm"), diameter_left));
dlg.SetButtonLabel(wxID_NO, wxString::Format(_L("Right nozzle: %smm"), diameter_right));
int result = dlg.ShowModal();
if (result == wxID_YES)
if (result == wxID_CANCEL)
diameter = diameter_left;
else if (result == wxID_NO)
diameter = diameter_right;

2
src/slic3r/GUI/Widgets/AMSItem.cpp
View File

@ -2445,7 +2445,7 @@ void AMSPreview::doRender(wxDC &dc)
dc.SetPen(wxPen(*wxTRANSPARENT_PEN));
if (wxWindow::IsEnabled()) {
if (wxWindow::IsThisEnabled()) {
wxColour color = iter->material_colour;
change_the_opacity(color);
dc.SetBrush(wxBrush(color));