3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-23 06:33:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

FIX: The cancel button should not make plate name valid

Browse source 
Change-Id: Id2b3935e87d443f5a594fdd588a63e502c0321e5
This commit is contained in:
zhou.xu 2023-08-09 09:03:17 +08:00 • committed by Lane.Wei
parent 060b41707e
commit 9b980c9bc6
2 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/slic3r/GUI/PlateSettingsDialog.cpp
View file

@ -246,9 +246,6 @@ PlateNameEditDialog::PlateNameEditDialog(wxWindow *parent, wxWindowID id, const
m_button_ok->SetMinSize(wxSize(FromDIP(58), FromDIP(24))); m_button_ok->SetMinSize(wxSize(FromDIP(58), FromDIP(24)));
m_button_ok->SetCornerRadius(FromDIP(12)); m_button_ok->SetCornerRadius(FromDIP(12));
m_button_ok->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent &e) { m_button_ok->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent &e) {
wxCommandEvent evt(EVT_SET_BED_TYPE_CONFIRM, GetId());
e.SetEventObject(this);
GetEventHandler()->ProcessEvent(evt);
if (this->IsModal()) if (this->IsModal())
EndModal(wxID_YES); EndModal(wxID_YES);
else else

11
src/slic3r/GUI/Plater.cpp
View file

@ -12168,12 +12168,11 @@ int Plater::select_plate_by_hover_id(int hover_id, bool right_click, bool isModi
wxString curr_plate_name = from_u8(curr_plate->get_plate_name()); wxString curr_plate_name = from_u8(curr_plate->get_plate_name());
dlg.set_plate_name(curr_plate_name); dlg.set_plate_name(curr_plate_name);
dlg.ShowModal(); int result=dlg.ShowModal();
if (result == wxID_YES) {
wxString dlg_plate_name = dlg.get_plate_name(); wxString dlg_plate_name = dlg.get_plate_name();
curr_plate->set_plate_name(dlg_plate_name.ToUTF8().data()); curr_plate->set_plate_name(dlg_plate_name.ToUTF8().data());
}
this->schedule_background_process();
} else { } else {
BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << "can not select plate %1%" << plate_index; BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << "can not select plate %1%" << plate_index;
ret = -1; ret = -1;