From e4f3738f2a92ebd78083e07ef8657a2f0581b28e Mon Sep 17 00:00:00 2001 From: "xin.zhang" Date: Tue, 21 Jan 2025 15:17:36 +0800 Subject: [PATCH] FIX: the text display incomplete jira: [none] Change-Id: If5dec5af26ee80b8f0d722b0d75d0bd10e09ddb5 (cherry picked from commit 784b5a69ccbe5b40c0e61760a5ae5e83712da886) --- src/slic3r/GUI/PrintOptionsDialog.cpp | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/src/slic3r/GUI/PrintOptionsDialog.cpp b/src/slic3r/GUI/PrintOptionsDialog.cpp index 17e48c42ae..d481675393 100644 --- a/src/slic3r/GUI/PrintOptionsDialog.cpp +++ b/src/slic3r/GUI/PrintOptionsDialog.cpp @@ -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));