juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-18 19:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX:Fix incomplete prompt message display

Browse Source 
jira:[STUDIO-12797]

Change-Id: Iefdcf23477b183e7c208092d9da347ee5669f8b3
(cherry picked from commit 081dfec94a95797847f67783f273632a78c3ead2)
This commit is contained in:
milk
2025-07-02 11:16:54 +08:00
committed by Noisyfox
parent 4deb47554a
commit 4bb326db16
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/slic3r/GUI/PrePrintChecker.cpp
View File

@@ -191,11 +191,11 @@ static wxColour _GetLabelColour(const prePrintInfo& info)
return *wxBLACK; // Default colour for normal messages return *wxBLACK; // Default colour for normal messages
} }
void PrinterMsgPanel::UpdateInfos(const std::vector<prePrintInfo>& infos) bool PrinterMsgPanel::UpdateInfos(const std::vector<prePrintInfo>& infos)
{ {
if (m_infos == infos) if (m_infos == infos)
{ {
return; return false;
} }
m_infos = infos; m_infos = infos;
@@ -229,7 +229,10 @@ void PrinterMsgPanel::UpdateInfos(const std::vector<prePrintInfo>& infos)
this->Show(); this->Show();
this->Layout(); this->Layout();
Fit(); Fit();
return true;
} }

2
src/slic3r/GUI/PrePrintChecker.hpp
View File

@@ -173,7 +173,7 @@ public:
PrinterMsgPanel(wxWindow *parent); PrinterMsgPanel(wxWindow *parent);
public: public:
void UpdateInfos(const std::vector<prePrintInfo>& infos); bool UpdateInfos(const std::vector<prePrintInfo>& infos);
private: private:
wxBoxSizer* m_sizer = nullptr; wxBoxSizer* m_sizer = nullptr;

8
src/slic3r/GUI/SelectMachine.cpp
View File

@@ -1422,8 +1422,12 @@ void SelectMachineDialog::prepare(int print_plate_idx)
void SelectMachineDialog::update_print_status_msg() void SelectMachineDialog::update_print_status_msg()
{ {
m_statictext_ams_msg->UpdateInfos(m_pre_print_checker.filamentList); bool is_ams_update = m_statictext_ams_msg->UpdateInfos(m_pre_print_checker.filamentList);
m_text_printer_msg->UpdateInfos(m_pre_print_checker.printerList); bool is_printer_update = m_text_printer_msg->UpdateInfos(m_pre_print_checker.printerList);
if (is_printer_update || is_ams_update) {
Layout();
}
} }
void SelectMachineDialog::update_print_error_info(int code, std::string msg, std::string extra) void SelectMachineDialog::update_print_error_info(int code, std::string msg, std::string extra)