From 9b9e339d151fada42dbf1ac3e9feba67d2ff6f30 Mon Sep 17 00:00:00 2001 From: tao wang Date: Wed, 16 Oct 2024 15:09:19 +0800 Subject: [PATCH] FIX:Fix the issue of text wrapping Change-Id: I360c08e37d58359b30df460df07ed8266ac5dd6a (cherry picked from commit 54a3e4786e11b47111b33a80788a376f0d238daa) --- src/slic3r/GUI/SelectMachine.cpp | 4 ++-- src/slic3r/GUI/SelectMachine.hpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index 631972109e..914773cfe9 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -297,7 +297,7 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater) m_sizer_printer->Add(m_comboBox_printer, 0, wxEXPAND, 0); m_sizer_printer->Add(m_button_refresh, 0, wxALL | wxLEFT, FromDIP(5)); - m_text_printer_msg = new wxStaticText(m_basic_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT); + m_text_printer_msg = new Label(m_basic_panel); m_text_printer_msg->SetMinSize(wxSize(FromDIP(420), -1)); m_text_printer_msg->SetMaxSize(wxSize(FromDIP(420), -1)); m_text_printer_msg->SetFont(::Label::Body_13); @@ -421,7 +421,7 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater) - m_statictext_ams_msg = new wxStaticText(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT); + m_statictext_ams_msg = new Label(this, wxEmptyString); m_statictext_ams_msg->SetMinSize(wxSize(FromDIP(600), -1)); m_statictext_ams_msg->SetMaxSize(wxSize(FromDIP(600), -1)); m_statictext_ams_msg->SetFont(::Label::Body_13); diff --git a/src/slic3r/GUI/SelectMachine.hpp b/src/slic3r/GUI/SelectMachine.hpp index b5a21a8ef2..5cb47b0fac 100644 --- a/src/slic3r/GUI/SelectMachine.hpp +++ b/src/slic3r/GUI/SelectMachine.hpp @@ -259,8 +259,8 @@ protected: Label* m_stext_printer_title{nullptr}; Label* m_stext_time{ nullptr }; Label* m_stext_weight{ nullptr }; - wxStaticText* m_statictext_ams_msg{ nullptr }; - wxStaticText* m_text_printer_msg{ nullptr }; + Label* m_statictext_ams_msg{ nullptr }; + Label* m_text_printer_msg{ nullptr }; wxStaticText* m_staticText_bed_title{ nullptr }; wxStaticText* m_stext_sending{ nullptr }; wxStaticText* m_statictext_finish{nullptr};