3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-01-02 04:50:34 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

FIX: the text display incomplete

Browse source 
jira: [none]
Change-Id: If5dec5af26ee80b8f0d722b0d75d0bd10e09ddb5
(cherry picked from commit 784b5a69ccbe5b40c0e61760a5ae5e83712da886)
This commit is contained in:
xin.zhang 2025-01-21 15:17:36 +08:00 • committed by Noisyfox
parent 32f4c15bf0
commit e4f3738f2a
1 changed files with 4 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/slic3r/GUI/PrintOptionsDialog.cpp
View file

@ -537,8 +537,6 @@ PrinterPartsDialog::PrinterPartsDialog(wxWindow* parent)
wxBoxSizer *multiple_left_line_sizer = new wxBoxSizer(wxHORIZONTAL);
auto multiple_left_nozzle_type = new Label(multiple_panel, _L("Nozzle Type"));
multiple_left_nozzle_type->SetFont(Label::Body_14);
multiple_left_nozzle_type->SetMinSize(wxSize(FromDIP(80), -1));
multiple_left_nozzle_type->SetMaxSize(wxSize(FromDIP(80), -1));
multiple_left_nozzle_type->SetForegroundColour(STATIC_TEXT_CAPTION_COL);
multiple_left_nozzle_type_checkbox = new ComboBox(multiple_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(FromDIP(140), -1), 0, NULL, wxCB_READONLY);
@ -548,15 +546,11 @@ PrinterPartsDialog::PrinterPartsDialog(wxWindow* parent)
auto multiple_left_nozzle_diameter = new Label(multiple_panel, _L("Nozzle Diameter"));
multiple_left_nozzle_diameter->SetFont(Label::Body_14);
multiple_left_nozzle_diameter->SetMinSize(wxSize(FromDIP(80), -1));
multiple_left_nozzle_diameter->SetMaxSize(wxSize(FromDIP(80), -1));
multiple_left_nozzle_diameter->SetForegroundColour(STATIC_TEXT_CAPTION_COL);
multiple_left_nozzle_diameter_checkbox = new ComboBox(multiple_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(FromDIP(140), -1), 0, NULL, wxCB_READONLY);
auto multiple_left_nozzle_flow = new Label(multiple_panel, _L("Nozzle Flow"));
multiple_left_nozzle_flow->SetFont(Label::Body_14);
multiple_left_nozzle_flow->SetMinSize(wxSize(FromDIP(80), -1));
multiple_left_nozzle_flow->SetMaxSize(wxSize(FromDIP(80), -1));
multiple_left_nozzle_flow->SetForegroundColour(STATIC_TEXT_CAPTION_COL);
multiple_left_nozzle_flow_checkbox = new ComboBox(multiple_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(FromDIP(140), -1), 0, NULL, wxCB_READONLY);
multiple_left_nozzle_flow_checkbox->Append(nozzle_flow_map[NozzleFlowType::S_FLOW]);
@ -567,11 +561,11 @@ PrinterPartsDialog::PrinterPartsDialog(wxWindow* parent)
multiple_left_line_sizer->Add(multiple_left_nozzle_type_checkbox, 0, wxALIGN_CENTER, 0);
multiple_left_line_sizer->Add(0, 0, 0, wxLEFT, FromDIP(15));
multiple_left_line_sizer->Add(multiple_left_nozzle_diameter, 0, wxALIGN_CENTER, 0);
multiple_left_line_sizer->Add(0, 0, 1, wxEXPAND, FromDIP(8));
multiple_left_line_sizer->Add(0, 0, 1, wxLEFT, FromDIP(8));
multiple_left_line_sizer->Add(multiple_left_nozzle_diameter_checkbox, 0, wxALIGN_CENTER, 0);
multiple_left_line_sizer->Add(0, 0, 0, wxLEFT, FromDIP(15));
multiple_left_line_sizer->Add(multiple_left_nozzle_flow, 0, wxALIGN_CENTER, 0);
multiple_left_line_sizer->Add(0, 0, 1, wxEXPAND, FromDIP(8));
multiple_left_line_sizer->Add(0, 0, 1, wxLEFT, FromDIP(8));
multiple_left_line_sizer->Add(multiple_left_nozzle_flow_checkbox, 0, wxALIGN_CENTER, 0);
/*right*/
@ -582,8 +576,6 @@ PrinterPartsDialog::PrinterPartsDialog(wxWindow* parent)
wxBoxSizer *multiple_right_line_sizer = new wxBoxSizer(wxHORIZONTAL);
auto multiple_right_nozzle_type = new Label(multiple_panel, _L("Nozzle Type"));
multiple_right_nozzle_type->SetFont(Label::Body_14);
multiple_right_nozzle_type->SetMinSize(wxSize(FromDIP(80), -1));
multiple_right_nozzle_type->SetMaxSize(wxSize(FromDIP(80), -1));
multiple_right_nozzle_type->SetForegroundColour(STATIC_TEXT_CAPTION_COL);
multiple_right_nozzle_type_checkbox = new ComboBox(multiple_panel, ID_NOZZLE_TYPE_CHECKBOX_RIGHT, wxEmptyString, wxDefaultPosition, wxSize(FromDIP(140), -1), 0, NULL, wxCB_READONLY);
@ -593,15 +585,11 @@ PrinterPartsDialog::PrinterPartsDialog(wxWindow* parent)
auto multiple_right_nozzle_diameter = new Label(multiple_panel, _L("Nozzle Diameter"));
multiple_right_nozzle_diameter->SetFont(Label::Body_14);
multiple_right_nozzle_diameter->SetMinSize(wxSize(FromDIP(80), -1));
multiple_right_nozzle_diameter->SetMaxSize(wxSize(FromDIP(80), -1));
multiple_right_nozzle_diameter->SetForegroundColour(STATIC_TEXT_CAPTION_COL);
multiple_right_nozzle_diameter_checkbox = new ComboBox(multiple_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(FromDIP(140), -1), 0, NULL, wxCB_READONLY);
auto multiple_right_nozzle_flow = new Label(multiple_panel, _L("Nozzle Flow"));
multiple_right_nozzle_flow->SetFont(Label::Body_14);
multiple_right_nozzle_flow->SetMinSize(wxSize(FromDIP(80), -1));
multiple_right_nozzle_flow->SetMaxSize(wxSize(FromDIP(80), -1));
multiple_right_nozzle_flow->SetForegroundColour(STATIC_TEXT_CAPTION_COL);
multiple_right_nozzle_flow_checkbox = new ComboBox(multiple_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(FromDIP(140), -1), 0, NULL, wxCB_READONLY);
multiple_right_nozzle_flow_checkbox->Append(nozzle_flow_map[NozzleFlowType::S_FLOW]);
@ -612,11 +600,11 @@ PrinterPartsDialog::PrinterPartsDialog(wxWindow* parent)
multiple_right_line_sizer->Add(multiple_right_nozzle_type_checkbox, 0, wxALIGN_CENTER, 0);
multiple_right_line_sizer->Add(0, 0, 0, wxLEFT, FromDIP(15));
multiple_right_line_sizer->Add(multiple_right_nozzle_diameter, 0, wxALIGN_CENTER, 0);
multiple_right_line_sizer->Add(0, 0, 1, wxEXPAND, FromDIP(8));
multiple_right_line_sizer->Add(0, 0, 1, wxLEFT, FromDIP(8));
multiple_right_line_sizer->Add(multiple_right_nozzle_diameter_checkbox, 0, wxALIGN_CENTER, 0);
multiple_right_line_sizer->Add(0, 0, 0, wxLEFT, FromDIP(15));
multiple_right_line_sizer->Add(multiple_right_nozzle_flow, 0, wxALIGN_CENTER, 0);
multiple_right_line_sizer->Add(0, 0, 1, wxEXPAND, FromDIP(8));
multiple_right_line_sizer->Add(0, 0, 1, wxLEFT, FromDIP(8));
multiple_right_line_sizer->Add(multiple_right_nozzle_flow_checkbox, 0, wxALIGN_CENTER, 0);
multiple_sizer->Add(0, 0, 0, wxTOP, FromDIP(40));