From 02fcbc785efae3c96a134a7ae77920693c95dc08 Mon Sep 17 00:00:00 2001 From: "zhou.xu" Date: Thu, 10 Apr 2025 09:58:32 +0800 Subject: [PATCH] ENH:change wxStaticText to label in linux to solve darkmode problem jira: STUDIO-11419 Change-Id: If7373deb03962ffd860a02acbf47b66f4dd68539 (cherry picked from commit c4325ade348731764afe3e645768387e402f8332) --- src/slic3r/GUI/SyncAmsInfoDialog.cpp | 4 ++-- src/slic3r/GUI/SyncAmsInfoDialog.hpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/slic3r/GUI/SyncAmsInfoDialog.cpp b/src/slic3r/GUI/SyncAmsInfoDialog.cpp index 00fc238cc..8e7497813 100644 --- a/src/slic3r/GUI/SyncAmsInfoDialog.cpp +++ b/src/slic3r/GUI/SyncAmsInfoDialog.cpp @@ -940,7 +940,7 @@ SyncAmsInfoDialog::SyncAmsInfoDialog(wxWindow *parent, SyncInfo &info) : m_append_color_checkbox->Hide(); m_append_color_sizer->Add(m_append_color_checkbox, 0, wxALIGN_LEFT | wxTOP, FromDIP(4)); const int gap_between_checebox_and_text = 2; - m_append_color_text = new wxStaticText(m_scrolledWindow, wxID_ANY, _L("Add unused AMS filaments to filaments list.")); + m_append_color_text = new Label(m_scrolledWindow, _L("Add unused AMS filaments to filaments list.")); m_append_color_text->Hide(); m_append_color_sizer->AddSpacer(FromDIP(gap_between_checebox_and_text)); m_append_color_sizer->Add(m_append_color_text, 0, wxALIGN_LEFT | wxTOP, FromDIP(4)); @@ -961,7 +961,7 @@ SyncAmsInfoDialog::SyncAmsInfoDialog(wxWindow *parent, SyncInfo &info) : m_merge_color_sizer->Add(m_merge_color_checkbox, 0, wxALIGN_LEFT | wxTOP, FromDIP(2)); - m_merge_color_text = new wxStaticText(m_scrolledWindow, wxID_ANY, _L("Automatically merge the same colors in the model after mapping.")); + m_merge_color_text = new Label(m_scrolledWindow, _L("Automatically merge the same colors in the model after mapping.")); m_merge_color_text->Hide(); m_merge_color_sizer->AddSpacer(FromDIP(gap_between_checebox_and_text)); m_merge_color_sizer->Add(m_merge_color_text, 0, wxALIGN_LEFT | wxTOP, FromDIP(2)); diff --git a/src/slic3r/GUI/SyncAmsInfoDialog.hpp b/src/slic3r/GUI/SyncAmsInfoDialog.hpp index 82af5e6ee..89922d0da 100644 --- a/src/slic3r/GUI/SyncAmsInfoDialog.hpp +++ b/src/slic3r/GUI/SyncAmsInfoDialog.hpp @@ -320,10 +320,10 @@ private: wxStaticBitmap * m_advanced_options_icon{nullptr}; wxBoxSizer * m_append_color_sizer = nullptr; ::CheckBox* m_append_color_checkbox = nullptr; - wxStaticText * m_append_color_text = nullptr; + Label * m_append_color_text = nullptr; wxBoxSizer * m_merge_color_sizer = nullptr; ::CheckBox* m_merge_color_checkbox = nullptr; - wxStaticText * m_merge_color_text = nullptr; + Label * m_merge_color_text = nullptr; bool m_is_empty_project = true; bool m_check_dirty_fialment = true;