juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-07-31 06:42:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move "bits" to inside the spinctrl box.

Browse Source
This commit is contained in:
Maeyanie
2026-01-31 20:17:23 -05:00
parent 8a798ac1c9
commit bb5887c5da
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/slic3r/GUI/Preferences.cpp
View File

@@ -557,7 +557,7 @@ wxBoxSizer *PreferencesDialog::create_item_input(wxString title, wxString title2
return sizer_input; return sizer_input;
} }
wxBoxSizer *PreferencesDialog::create_item_spinctrl(wxString title, wxString title2, wxString tooltip, std::string param, wxBoxSizer *PreferencesDialog::create_item_spinctrl(wxString title, wxString title2, wxString title3, wxString tooltip, std::string param,
int min, int max, std::function<void(int)> onchange) int min, int max, std::function<void(int)> onchange)
{ {
wxBoxSizer *sizer_input = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer *sizer_input = new wxBoxSizer(wxHORIZONTAL);
@@ -567,13 +567,13 @@ wxBoxSizer *PreferencesDialog::create_item_spinctrl(wxString title, wxString tit
input_title->SetToolTip(tooltip); input_title->SetToolTip(tooltip);
input_title->Wrap(DESIGN_TITLE_SIZE.x); input_title->Wrap(DESIGN_TITLE_SIZE.x);
auto input = new ::SpinInput(m_parent, wxEmptyString, wxEmptyString, wxDefaultPosition, DESIGN_INPUT_SIZE, wxSP_ARROW_KEYS, auto input = new ::SpinInput(m_parent, wxEmptyString, title2, wxDefaultPosition, DESIGN_INPUT_SIZE, wxSP_ARROW_KEYS,
min, max, stoi(app_config->get(param))); min, max, stoi(app_config->get(param)));
StateColor input_bg(std::pair<wxColour, int>(wxColour("#F0F0F1"), StateColor::Disabled), std::pair<wxColour, int>(*wxWHITE, StateColor::Enabled)); StateColor input_bg(std::pair<wxColour, int>(wxColour("#F0F0F1"), StateColor::Disabled), std::pair<wxColour, int>(*wxWHITE, StateColor::Enabled));
input->SetBackgroundColor(input_bg); input->SetBackgroundColor(input_bg);
input->SetToolTip(tooltip); input->SetToolTip(tooltip);
auto second_title = new wxStaticText(m_parent, wxID_ANY, title2, wxDefaultPosition, wxDefaultSize, 0); auto second_title = new wxStaticText(m_parent, wxID_ANY, title3, wxDefaultPosition, wxDefaultSize, 0);
second_title->SetForegroundColour(DESIGN_GRAY900_COLOR); second_title->SetForegroundColour(DESIGN_GRAY900_COLOR);
second_title->SetFont(::Label::Body_14); second_title->SetFont(::Label::Body_14);
second_title->SetToolTip(tooltip); second_title->SetToolTip(tooltip);
@@ -1362,6 +1362,7 @@ void PreferencesDialog::create_items()
auto item_draco_position_bits = create_item_spinctrl(_L("Draco dimensional accuracy on export"), auto item_draco_position_bits = create_item_spinctrl(_L("Draco dimensional accuracy on export"),
_L("bits"), _L("bits"),
wxEmptyString,
_L("0 bits disables quantization producing an effectively lossless but compressed file.\n" _L("0 bits disables quantization producing an effectively lossless but compressed file.\n"
"~16 bits may be recommended and within the tolerances of 3D printing.\n" "~16 bits may be recommended and within the tolerances of 3D printing.\n"
"More bits results in better quality and dimensional accuracy but larger file size.\n"), "More bits results in better quality and dimensional accuracy but larger file size.\n"),

2
src/slic3r/GUI/Preferences.hpp
View File

@@ -91,7 +91,7 @@ public:
wxBoxSizer *create_item_button(wxString title, wxString title2, wxString tooltip, wxString tooltip2, std::function<void()> onclick); wxBoxSizer *create_item_button(wxString title, wxString title2, wxString tooltip, wxString tooltip2, std::function<void()> onclick);
wxBoxSizer *create_item_downloads(wxString title, wxString tooltip); wxBoxSizer *create_item_downloads(wxString title, wxString tooltip);
wxBoxSizer *create_item_input(wxString title, wxString title2, wxString tooltip, std::string param, std::function<void(wxString)> onchange = {}); wxBoxSizer *create_item_input(wxString title, wxString title2, wxString tooltip, std::string param, std::function<void(wxString)> onchange = {});
wxBoxSizer *create_item_spinctrl(wxString title, wxString title2, wxString tooltip, std::string param, int min, int max, std::function<void(int)> onchange = nullptr); wxBoxSizer *create_item_spinctrl(wxString title, wxString title2, wxString title3, wxString tooltip, std::string param, int min, int max, std::function<void(int)> onchange = nullptr);
wxBoxSizer *create_camera_orbit_mult_input(wxString title, wxString tooltip); wxBoxSizer *create_camera_orbit_mult_input(wxString title, wxString tooltip);
wxBoxSizer *create_item_backup(wxString title, wxString tooltip); wxBoxSizer *create_item_backup(wxString title, wxString tooltip);
wxBoxSizer *create_item_auto_reslice(wxString title, wxString checkbox_tooltip, wxString delay_tooltip); wxBoxSizer *create_item_auto_reslice(wxString title, wxString checkbox_tooltip, wxString delay_tooltip);