mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-12-31 11:50:33 -07:00
FIX:Fix incomplete prompt message display
jira:[STUDIO-12797] Change-Id: Iefdcf23477b183e7c208092d9da347ee5669f8b3 (cherry picked from commit 081dfec94a95797847f67783f273632a78c3ead2)
This commit is contained in:
parent
4deb47554a
commit
4bb326db16
3 changed files with 12 additions and 5 deletions
|
|
@ -191,11 +191,11 @@ static wxColour _GetLabelColour(const prePrintInfo& info)
|
|||
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)
|
||||
{
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
m_infos = infos;
|
||||
|
||||
|
|
@ -229,7 +229,10 @@ void PrinterMsgPanel::UpdateInfos(const std::vector<prePrintInfo>& infos)
|
|||
|
||||
this->Show();
|
||||
this->Layout();
|
||||
|
||||
Fit();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -173,7 +173,7 @@ public:
|
|||
PrinterMsgPanel(wxWindow *parent);
|
||||
|
||||
public:
|
||||
void UpdateInfos(const std::vector<prePrintInfo>& infos);
|
||||
bool UpdateInfos(const std::vector<prePrintInfo>& infos);
|
||||
|
||||
private:
|
||||
wxBoxSizer* m_sizer = nullptr;
|
||||
|
|
|
|||
|
|
@ -1422,8 +1422,12 @@ void SelectMachineDialog::prepare(int print_plate_idx)
|
|||
|
||||
void SelectMachineDialog::update_print_status_msg()
|
||||
{
|
||||
m_statictext_ams_msg->UpdateInfos(m_pre_print_checker.filamentList);
|
||||
m_text_printer_msg->UpdateInfos(m_pre_print_checker.printerList);
|
||||
bool is_ams_update = m_statictext_ams_msg->UpdateInfos(m_pre_print_checker.filamentList);
|
||||
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)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue