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

ENH:change wxStaticText to label in linux to solve darkmode problem

Browse Source 
jira: STUDIO-11419
Change-Id: If7373deb03962ffd860a02acbf47b66f4dd68539
(cherry picked from commit c4325ade348731764afe3e645768387e402f8332)
(cherry picked from commit 02fcbc785efae3c96a134a7ae77920693c95dc08)
This commit is contained in:
zhou.xu
2025-04-10 09:58:32 +08:00
committed by Noisyfox
parent 60005def4c
commit d408db2fde
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/slic3r/GUI/SyncAmsInfoDialog.cpp
View File

@@ -942,7 +942,7 @@ SyncAmsInfoDialog::SyncAmsInfoDialog(wxWindow *parent, SyncInfo &info) :
m_append_color_checkbox->Hide(); m_append_color_checkbox->Hide();
m_append_color_sizer->Add(m_append_color_checkbox, 0, wxALIGN_LEFT | wxTOP, FromDIP(4)); m_append_color_sizer->Add(m_append_color_checkbox, 0, wxALIGN_LEFT | wxTOP, FromDIP(4));
const int gap_between_checebox_and_text = 2; 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_text->Hide();
m_append_color_sizer->AddSpacer(FromDIP(gap_between_checebox_and_text)); 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)); m_append_color_sizer->Add(m_append_color_text, 0, wxALIGN_LEFT | wxTOP, FromDIP(4));
@@ -963,7 +963,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_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_text->Hide();
m_merge_color_sizer->AddSpacer(FromDIP(gap_between_checebox_and_text)); 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)); m_merge_color_sizer->Add(m_merge_color_text, 0, wxALIGN_LEFT | wxTOP, FromDIP(2));

4
src/slic3r/GUI/SyncAmsInfoDialog.hpp
View File

@@ -320,10 +320,10 @@ private:
wxStaticBitmap * m_advanced_options_icon{nullptr}; wxStaticBitmap * m_advanced_options_icon{nullptr};
wxBoxSizer * m_append_color_sizer = nullptr; wxBoxSizer * m_append_color_sizer = nullptr;
::CheckBox* m_append_color_checkbox = 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; wxBoxSizer * m_merge_color_sizer = nullptr;
::CheckBox* m_merge_color_checkbox = 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_is_empty_project = true;
bool m_check_dirty_fialment = true; bool m_check_dirty_fialment = true;