mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-12 09:17:52 -06:00
Fixed layout of extruder color icon
This commit is contained in:
parent
6b4f6f43dd
commit
097e7a12ae
1 changed files with 12 additions and 8 deletions
|
@ -218,28 +218,32 @@ WipingPanel::WipingPanel(wxWindow* parent, const std::vector<float>& matrix, con
|
||||||
edit_boxes[i][j]->SetValue(wxString("") << int(matrix[m_number_of_extruders*j + i]));
|
edit_boxes[i][j]->SetValue(wxString("") << int(matrix[m_number_of_extruders*j + i]));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const int clr_icon_side = edit_boxes.front().front()->GetSize().y;
|
||||||
|
const auto icon_size = wxSize(clr_icon_side, clr_icon_side);
|
||||||
|
|
||||||
m_gridsizer_advanced->Add(new wxStaticText(m_page_advanced, wxID_ANY, wxString("")));
|
m_gridsizer_advanced->Add(new wxStaticText(m_page_advanced, wxID_ANY, wxString("")));
|
||||||
for (unsigned int i = 0; i < m_number_of_extruders; ++i) {
|
for (unsigned int i = 0; i < m_number_of_extruders; ++i) {
|
||||||
auto hsizer = new wxBoxSizer(wxHORIZONTAL);
|
auto hsizer = new wxBoxSizer(wxHORIZONTAL);
|
||||||
hsizer->AddSpacer(20);
|
hsizer->AddSpacer(20);
|
||||||
hsizer->Add(new wxStaticText(m_page_advanced, wxID_ANY, wxString("") << i + 1), 0, wxALIGN_CENTER);
|
hsizer->Add(new wxStaticText(m_page_advanced, wxID_ANY, wxString("") << i + 1), 0, wxALIGN_CENTER);
|
||||||
wxWindow* w = new wxWindow(m_page_advanced, wxID_ANY, wxDefaultPosition, wxSize(25, 25), wxBORDER_SIMPLE);
|
wxWindow* w = new wxWindow(m_page_advanced, wxID_ANY, wxDefaultPosition, icon_size, wxBORDER_SIMPLE);
|
||||||
w->SetCanFocus(false);
|
w->SetCanFocus(false);
|
||||||
w->SetBackgroundColour(m_colours[i]);
|
w->SetBackgroundColour(m_colours[i]);
|
||||||
hsizer->AddSpacer(10);
|
hsizer->AddStretchSpacer();
|
||||||
hsizer->Add(w);
|
hsizer->Add(w);
|
||||||
m_gridsizer_advanced->Add(hsizer);
|
m_gridsizer_advanced->Add(hsizer, 1, wxEXPAND);
|
||||||
}
|
}
|
||||||
for (unsigned int i = 0; i < m_number_of_extruders; ++i) {
|
for (unsigned int i = 0; i < m_number_of_extruders; ++i) {
|
||||||
auto hsizer = new wxBoxSizer(wxHORIZONTAL);
|
auto hsizer = new wxBoxSizer(wxHORIZONTAL);
|
||||||
wxWindow* w = new wxWindow(m_page_advanced, wxID_ANY, wxDefaultPosition, wxSize(25, 25), wxBORDER_SIMPLE);
|
wxWindow* w = new wxWindow(m_page_advanced, wxID_ANY, wxDefaultPosition, icon_size, wxBORDER_SIMPLE);
|
||||||
w->SetCanFocus(false);
|
w->SetCanFocus(false);
|
||||||
w->SetBackgroundColour(m_colours[i]);
|
w->SetBackgroundColour(m_colours[i]);
|
||||||
hsizer->AddSpacer(20);
|
hsizer->AddSpacer(20);
|
||||||
hsizer->Add(new wxStaticText(m_page_advanced, wxID_ANY, wxString("") << i + 1), 0, wxALIGN_CENTER | wxALIGN_CENTER_VERTICAL);
|
hsizer->Add(new wxStaticText(m_page_advanced, wxID_ANY, wxString("") << i + 1), 0, wxALIGN_CENTER | wxALIGN_CENTER_VERTICAL);
|
||||||
hsizer->AddSpacer(10);
|
hsizer->AddStretchSpacer();
|
||||||
hsizer->Add(w);
|
hsizer->Add(w);
|
||||||
m_gridsizer_advanced->Add(hsizer);
|
m_gridsizer_advanced->Add(hsizer, 1, wxEXPAND);
|
||||||
|
|
||||||
for (unsigned int j = 0; j < m_number_of_extruders; ++j)
|
for (unsigned int j = 0; j < m_number_of_extruders; ++j)
|
||||||
m_gridsizer_advanced->Add(edit_boxes[j][i], 0);
|
m_gridsizer_advanced->Add(edit_boxes[j][i], 0);
|
||||||
|
@ -264,14 +268,14 @@ WipingPanel::WipingPanel(wxWindow* parent, const std::vector<float>& matrix, con
|
||||||
m_new.push_back(new wxSpinCtrl(m_page_simple,wxID_ANY,wxEmptyString,wxDefaultPosition, wxSize(ITEM_WIDTH(), -1),wxSP_ARROW_KEYS|wxALIGN_RIGHT,0,300,extruders[2*i+1]));
|
m_new.push_back(new wxSpinCtrl(m_page_simple,wxID_ANY,wxEmptyString,wxDefaultPosition, wxSize(ITEM_WIDTH(), -1),wxSP_ARROW_KEYS|wxALIGN_RIGHT,0,300,extruders[2*i+1]));
|
||||||
|
|
||||||
auto hsizer = new wxBoxSizer(wxHORIZONTAL);
|
auto hsizer = new wxBoxSizer(wxHORIZONTAL);
|
||||||
wxWindow* w = new wxWindow(m_page_simple, wxID_ANY, wxDefaultPosition, wxSize(25, 25), wxBORDER_SIMPLE);
|
wxWindow* w = new wxWindow(m_page_simple, wxID_ANY, wxDefaultPosition, icon_size, wxBORDER_SIMPLE);
|
||||||
w->SetCanFocus(false);
|
w->SetCanFocus(false);
|
||||||
w->SetBackgroundColour(m_colours[i]);
|
w->SetBackgroundColour(m_colours[i]);
|
||||||
hsizer->Add(w, wxALIGN_CENTER_VERTICAL);
|
hsizer->Add(w, wxALIGN_CENTER_VERTICAL);
|
||||||
hsizer->AddSpacer(10);
|
hsizer->AddSpacer(10);
|
||||||
hsizer->Add(new wxStaticText(m_page_simple, wxID_ANY, wxString(_(L("Tool #"))) << i + 1 << ": "), 0, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL);
|
hsizer->Add(new wxStaticText(m_page_simple, wxID_ANY, wxString(_(L("Tool #"))) << i + 1 << ": "), 0, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL);
|
||||||
|
|
||||||
gridsizer_simple->Add(hsizer, wxALIGN_CENTER_VERTICAL);
|
gridsizer_simple->Add(hsizer, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL);
|
||||||
gridsizer_simple->Add(m_old.back(),0);
|
gridsizer_simple->Add(m_old.back(),0);
|
||||||
gridsizer_simple->Add(m_new.back(),0);
|
gridsizer_simple->Add(m_new.back(),0);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue