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

FIX: the layout problem

Browse Source 
jira: [STUDIO-12368]
Change-Id: Ifb49271f5daff80c28ae64f984b512d6a6519e28
(cherry picked from commit ba8691b1c429f1071ac7043bd6b58febc3b78c2d)
This commit is contained in:
xin.zhang
2025-05-23 18:40:20 +08:00
committed by Noisyfox
parent 4b6b3cc7bd
commit 9fa3978133
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/slic3r/GUI/StatusPanel.cpp
View File

@@ -5605,6 +5605,7 @@ wxBoxSizer *ScoreDialog::get_score_sizer() {
wxBoxSizer *ScoreDialog::get_star_sizer() wxBoxSizer *ScoreDialog::get_star_sizer()
{ {
wxBoxSizer *static_score_star_sizer = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer *static_score_star_sizer = new wxBoxSizer(wxHORIZONTAL);
static_score_star_sizer->AddSpacer(FromDIP(20));
m_score_star.resize(5); m_score_star.resize(5);
for (int i = 0; i < m_score_star.size(); ++i) { for (int i = 0; i < m_score_star.size(); ++i) {
if (!m_success_printed && m_star_count > 3) { if (!m_success_printed && m_star_count > 3) {
@@ -5620,6 +5621,8 @@ wxBoxSizer *ScoreDialog::get_star_sizer()
m_score_star[i] = new ScalableButton(this, wxID_ANY, "score_star_dark", wxEmptyString, wxSize(FromDIP(26), FromDIP(26)), wxDefaultPosition, m_score_star[i] = new ScalableButton(this, wxID_ANY, "score_star_dark", wxEmptyString, wxSize(FromDIP(26), FromDIP(26)), wxDefaultPosition,
wxBU_EXACTFIT | wxNO_BORDER, true, 26); wxBU_EXACTFIT | wxNO_BORDER, true, 26);
m_score_star[i]->SetMinSize(wxSize(FromDIP(26), FromDIP(26)));
m_score_star[i]->SetMaxSize(wxSize(FromDIP(26), FromDIP(26)));
m_score_star[i]->Bind(wxEVT_LEFT_DOWN, [this, i](auto &e) { m_score_star[i]->Bind(wxEVT_LEFT_DOWN, [this, i](auto &e) {
if (!m_success_printed && i >= 3) { if (!m_success_printed && i >= 3) {
warning_text->Show(); warning_text->Show();
@@ -5644,7 +5647,7 @@ wxBoxSizer *ScoreDialog::get_star_sizer()
m_score_star[k]->SetBitmap(dark_star.bmp()); m_score_star[k]->SetBitmap(dark_star.bmp());
} }
}); });
static_score_star_sizer->Add(m_score_star[i], 0, wxEXPAND | wxLEFT, FromDIP(20)); static_score_star_sizer->Add(m_score_star[i], 1, wxEXPAND | wxLEFT, FromDIP(5));
} }
return static_score_star_sizer; return static_score_star_sizer;
@@ -5770,7 +5773,7 @@ wxBoxSizer *ScoreDialog::get_button_sizer()
m_button_ok = new Button(this, _L("Submit")); m_button_ok = new Button(this, _L("Submit"));
m_button_ok->SetBackgroundColor(btn_bg_green); m_button_ok->SetBackgroundColor(btn_bg_green);
m_button_ok->SetBorderColor(*wxWHITE); m_button_ok->SetBorderColor(*wxWHITE);
m_button_ok->SetTextColor(wxColour(0xFFFFFE)); m_button_ok->SetTextColor(wxColour("#FFFFFE"));
m_button_ok->SetFont(Label::Body_12); m_button_ok->SetFont(Label::Body_12);
m_button_ok->SetSize(wxSize(FromDIP(58), FromDIP(24))); m_button_ok->SetSize(wxSize(FromDIP(58), FromDIP(24)));
m_button_ok->SetMinSize(wxSize(FromDIP(58), FromDIP(24))); m_button_ok->SetMinSize(wxSize(FromDIP(58), FromDIP(24)));
@@ -5976,7 +5979,7 @@ wxBoxSizer *ScoreDialog::get_main_sizer(const std::vector<std::pair<wxString, st
m_main_sizer->Add(0, 0, 0, wxBOTTOM, FromDIP(8)); m_main_sizer->Add(0, 0, 0, wxBOTTOM, FromDIP(8));
wxBoxSizer *static_score_star_sizer = get_star_sizer(); wxBoxSizer *static_score_star_sizer = get_star_sizer();
m_main_sizer->Add(static_score_star_sizer, 0, wxEXPAND | wxBOTTOM, FromDIP(20)); m_main_sizer->Add(static_score_star_sizer, 1, wxEXPAND | wxBOTTOM, FromDIP(20));
m_main_sizer->Add(warning_text, 0, wxEXPAND | wxLEFT, FromDIP(24)); m_main_sizer->Add(warning_text, 0, wxEXPAND | wxLEFT, FromDIP(24));
m_main_sizer->Add(0, 0, 0, wxBOTTOM, FromDIP(8)); m_main_sizer->Add(0, 0, 0, wxBOTTOM, FromDIP(8));