diff --git a/resources/images/bed_cool.png b/resources/images/bed_cool.png index 41234a1ac5..625ebd6325 100644 Binary files a/resources/images/bed_cool.png and b/resources/images/bed_cool.png differ diff --git a/resources/images/bed_cool_supertack.png b/resources/images/bed_cool_supertack.png index cf05fb85ea..1c13570943 100644 Binary files a/resources/images/bed_cool_supertack.png and b/resources/images/bed_cool_supertack.png differ diff --git a/resources/images/bed_cool_supertack_mini.png b/resources/images/bed_cool_supertack_mini.png deleted file mode 100644 index b363b43093..0000000000 Binary files a/resources/images/bed_cool_supertack_mini.png and /dev/null differ diff --git a/resources/images/bed_cool_supertack_n.png b/resources/images/bed_cool_supertack_n.png deleted file mode 100644 index 7ba934c97a..0000000000 Binary files a/resources/images/bed_cool_supertack_n.png and /dev/null differ diff --git a/resources/images/bed_cool_supertack_o.png b/resources/images/bed_cool_supertack_o.png deleted file mode 100644 index b7a143a2df..0000000000 Binary files a/resources/images/bed_cool_supertack_o.png and /dev/null differ diff --git a/resources/images/bed_engineering.png b/resources/images/bed_engineering.png index 9fe23a2666..62a3ad9093 100644 Binary files a/resources/images/bed_engineering.png and b/resources/images/bed_engineering.png differ diff --git a/resources/images/bed_engineering_n.png b/resources/images/bed_engineering_n.png deleted file mode 100644 index 5ad3ab938f..0000000000 Binary files a/resources/images/bed_engineering_n.png and /dev/null differ diff --git a/resources/images/bed_engineering_o.png b/resources/images/bed_engineering_o.png deleted file mode 100644 index 4be2320dde..0000000000 Binary files a/resources/images/bed_engineering_o.png and /dev/null differ diff --git a/resources/images/bed_high_templ.png b/resources/images/bed_high_templ.png index 3fe8a603c8..d7f80aee92 100644 Binary files a/resources/images/bed_high_templ.png and b/resources/images/bed_high_templ.png differ diff --git a/resources/images/bed_high_templ_mini.png b/resources/images/bed_high_templ_mini.png deleted file mode 100644 index 6036556c0a..0000000000 Binary files a/resources/images/bed_high_templ_mini.png and /dev/null differ diff --git a/resources/images/bed_high_templ_n.png b/resources/images/bed_high_templ_n.png deleted file mode 100644 index 3fe8a603c8..0000000000 Binary files a/resources/images/bed_high_templ_n.png and /dev/null differ diff --git a/resources/images/bed_high_templ_o.png b/resources/images/bed_high_templ_o.png deleted file mode 100644 index f0fadb7667..0000000000 Binary files a/resources/images/bed_high_templ_o.png and /dev/null differ diff --git a/resources/images/bed_pei.png b/resources/images/bed_pei.png index 4a1913516d..c942905304 100644 Binary files a/resources/images/bed_pei.png and b/resources/images/bed_pei.png differ diff --git a/resources/images/bed_plate_cool_textured.png b/resources/images/bed_pei_cool.png similarity index 100% rename from resources/images/bed_plate_cool_textured.png rename to resources/images/bed_pei_cool.png diff --git a/resources/images/bed_pei_mini.png b/resources/images/bed_pei_mini.png deleted file mode 100644 index cea0373230..0000000000 Binary files a/resources/images/bed_pei_mini.png and /dev/null differ diff --git a/resources/images/bed_pei_n.png b/resources/images/bed_pei_n.png deleted file mode 100644 index 4a1913516d..0000000000 Binary files a/resources/images/bed_pei_n.png and /dev/null differ diff --git a/resources/images/bed_pei_o.png b/resources/images/bed_pei_o.png deleted file mode 100644 index d6fd7ce0a6..0000000000 Binary files a/resources/images/bed_pei_o.png and /dev/null differ diff --git a/resources/images/bed_plate_cool_smooth.png b/resources/images/bed_plate_cool_smooth.png deleted file mode 100644 index 625ebd6325..0000000000 Binary files a/resources/images/bed_plate_cool_smooth.png and /dev/null differ diff --git a/resources/images/bed_plate_cool_supertack.png b/resources/images/bed_plate_cool_supertack.png deleted file mode 100644 index 1c13570943..0000000000 Binary files a/resources/images/bed_plate_cool_supertack.png and /dev/null differ diff --git a/resources/images/bed_plate_engineering.png b/resources/images/bed_plate_engineering.png deleted file mode 100644 index 62a3ad9093..0000000000 Binary files a/resources/images/bed_plate_engineering.png and /dev/null differ diff --git a/resources/images/bed_plate_high_temp_smooth.png b/resources/images/bed_plate_high_temp_smooth.png deleted file mode 100644 index d7f80aee92..0000000000 Binary files a/resources/images/bed_plate_high_temp_smooth.png and /dev/null differ diff --git a/resources/images/bed_plate_pei.png b/resources/images/bed_plate_pei.png deleted file mode 100644 index c942905304..0000000000 Binary files a/resources/images/bed_plate_pei.png and /dev/null differ diff --git a/resources/images/big_bed_cool.png b/resources/images/big_bed_cool.png index 2d2917e2ed..66ea212bc3 100644 Binary files a/resources/images/big_bed_cool.png and b/resources/images/big_bed_cool.png differ diff --git a/resources/images/big_bed_cool_supertack.png b/resources/images/big_bed_cool_supertack.png index 87ab558248..bbd607e7a8 100644 Binary files a/resources/images/big_bed_cool_supertack.png and b/resources/images/big_bed_cool_supertack.png differ diff --git a/resources/images/big_bed_cool_supertack_mini.png b/resources/images/big_bed_cool_supertack_mini.png deleted file mode 100644 index 18605c6b67..0000000000 Binary files a/resources/images/big_bed_cool_supertack_mini.png and /dev/null differ diff --git a/resources/images/big_bed_cool_supertack_n.png b/resources/images/big_bed_cool_supertack_n.png deleted file mode 100644 index 1d87d3e831..0000000000 Binary files a/resources/images/big_bed_cool_supertack_n.png and /dev/null differ diff --git a/resources/images/big_bed_cool_supertack_o.png b/resources/images/big_bed_cool_supertack_o.png deleted file mode 100644 index d2bf848979..0000000000 Binary files a/resources/images/big_bed_cool_supertack_o.png and /dev/null differ diff --git a/resources/images/big_bed_engineering.png b/resources/images/big_bed_engineering.png index 7cdd39b641..2cd6e7fe08 100644 Binary files a/resources/images/big_bed_engineering.png and b/resources/images/big_bed_engineering.png differ diff --git a/resources/images/big_bed_engineering_n.png b/resources/images/big_bed_engineering_n.png deleted file mode 100644 index d8329e8b0c..0000000000 Binary files a/resources/images/big_bed_engineering_n.png and /dev/null differ diff --git a/resources/images/big_bed_engineering_o.png b/resources/images/big_bed_engineering_o.png deleted file mode 100644 index 87cf402281..0000000000 Binary files a/resources/images/big_bed_engineering_o.png and /dev/null differ diff --git a/resources/images/big_bed_high_templ.png b/resources/images/big_bed_high_templ.png index ebc1b5f237..7b3bc41569 100644 Binary files a/resources/images/big_bed_high_templ.png and b/resources/images/big_bed_high_templ.png differ diff --git a/resources/images/big_bed_high_templ_mini.png b/resources/images/big_bed_high_templ_mini.png deleted file mode 100644 index 8f5800af04..0000000000 Binary files a/resources/images/big_bed_high_templ_mini.png and /dev/null differ diff --git a/resources/images/big_bed_high_templ_n.png b/resources/images/big_bed_high_templ_n.png deleted file mode 100644 index ebc1b5f237..0000000000 Binary files a/resources/images/big_bed_high_templ_n.png and /dev/null differ diff --git a/resources/images/big_bed_high_templ_o.png b/resources/images/big_bed_high_templ_o.png deleted file mode 100644 index e75df475ac..0000000000 Binary files a/resources/images/big_bed_high_templ_o.png and /dev/null differ diff --git a/resources/images/big_bed_pei.png b/resources/images/big_bed_pei.png index e87d15993d..d76c16f13c 100644 Binary files a/resources/images/big_bed_pei.png and b/resources/images/big_bed_pei.png differ diff --git a/resources/images/big_bed_plate_cool_textured.png b/resources/images/big_bed_pei_cool.png similarity index 100% rename from resources/images/big_bed_plate_cool_textured.png rename to resources/images/big_bed_pei_cool.png diff --git a/resources/images/big_bed_pei_mini.png b/resources/images/big_bed_pei_mini.png deleted file mode 100644 index 18878f8147..0000000000 Binary files a/resources/images/big_bed_pei_mini.png and /dev/null differ diff --git a/resources/images/big_bed_pei_n.png b/resources/images/big_bed_pei_n.png deleted file mode 100644 index e87d15993d..0000000000 Binary files a/resources/images/big_bed_pei_n.png and /dev/null differ diff --git a/resources/images/big_bed_pei_o.png b/resources/images/big_bed_pei_o.png deleted file mode 100644 index 51a5bef46a..0000000000 Binary files a/resources/images/big_bed_pei_o.png and /dev/null differ diff --git a/resources/images/big_bed_plate_cool_smooth.png b/resources/images/big_bed_plate_cool_smooth.png deleted file mode 100644 index 66ea212bc3..0000000000 Binary files a/resources/images/big_bed_plate_cool_smooth.png and /dev/null differ diff --git a/resources/images/big_bed_plate_cool_supertack.png b/resources/images/big_bed_plate_cool_supertack.png deleted file mode 100644 index bbd607e7a8..0000000000 Binary files a/resources/images/big_bed_plate_cool_supertack.png and /dev/null differ diff --git a/resources/images/big_bed_plate_engineering.png b/resources/images/big_bed_plate_engineering.png deleted file mode 100644 index 2cd6e7fe08..0000000000 Binary files a/resources/images/big_bed_plate_engineering.png and /dev/null differ diff --git a/resources/images/big_bed_plate_high_temp_smooth.png b/resources/images/big_bed_plate_high_temp_smooth.png deleted file mode 100644 index 7b3bc41569..0000000000 Binary files a/resources/images/big_bed_plate_high_temp_smooth.png and /dev/null differ diff --git a/resources/images/big_bed_plate_pei.png b/resources/images/big_bed_plate_pei.png deleted file mode 100644 index d76c16f13c..0000000000 Binary files a/resources/images/big_bed_plate_pei.png and /dev/null differ diff --git a/resources/images/printer_placeholder.png b/resources/images/printer_placeholder.png index bc1b2af2ed..636ffc1075 100644 Binary files a/resources/images/printer_placeholder.png and b/resources/images/printer_placeholder.png differ diff --git a/resources/images/printer_preview_BL-P001.png b/resources/images/printer_preview_BL-P001.png index 5bf40ff509..7673774115 100644 Binary files a/resources/images/printer_preview_BL-P001.png and b/resources/images/printer_preview_BL-P001.png differ diff --git a/resources/images/printer_preview_BL-P002.png b/resources/images/printer_preview_BL-P002.png index 5bf40ff509..d8b089524c 100644 Binary files a/resources/images/printer_preview_BL-P002.png and b/resources/images/printer_preview_BL-P002.png differ diff --git a/resources/images/printer_preview_C11.png b/resources/images/printer_preview_C11.png index bbe6b42562..78c0d5d115 100644 Binary files a/resources/images/printer_preview_C11.png and b/resources/images/printer_preview_C11.png differ diff --git a/resources/images/printer_preview_C12.png b/resources/images/printer_preview_C12.png index d9b3294e7e..04d179dd05 100644 Binary files a/resources/images/printer_preview_C12.png and b/resources/images/printer_preview_C12.png differ diff --git a/resources/images/printer_preview_C13.png b/resources/images/printer_preview_C13.png index 7d666d02dd..5ae4c807d6 100644 Binary files a/resources/images/printer_preview_C13.png and b/resources/images/printer_preview_C13.png differ diff --git a/resources/images/printer_preview_N1.png b/resources/images/printer_preview_N1.png index 80fbe7dc2d..060e0a2d2c 100644 Binary files a/resources/images/printer_preview_N1.png and b/resources/images/printer_preview_N1.png differ diff --git a/resources/images/printer_preview_N2S.png b/resources/images/printer_preview_N2S.png index d7a640e41f..e6a3358061 100644 Binary files a/resources/images/printer_preview_N2S.png and b/resources/images/printer_preview_N2S.png differ diff --git a/resources/images/printer_preview_O1D.png b/resources/images/printer_preview_O1D.png index 69ad76d373..3f3a099bc7 100644 Binary files a/resources/images/printer_preview_O1D.png and b/resources/images/printer_preview_O1D.png differ diff --git a/resources/images/printer_preview_O1E.png b/resources/images/printer_preview_O1E.png index 255b4b37fe..d45e231794 100644 Binary files a/resources/images/printer_preview_O1E.png and b/resources/images/printer_preview_O1E.png differ diff --git a/resources/images/printer_preview_O1S.png b/resources/images/printer_preview_O1S.png index c5f8a5c5aa..70a048d50a 100644 Binary files a/resources/images/printer_preview_O1S.png and b/resources/images/printer_preview_O1S.png differ diff --git a/resources/images/printer_sync.svg b/resources/images/printer_sync.svg index 449ab9a97d..f052eec5b4 100644 --- a/resources/images/printer_sync.svg +++ b/resources/images/printer_sync.svg @@ -1,10 +1 @@ - - - - - - - - - - + \ No newline at end of file diff --git a/resources/images/printer_sync_not.svg b/resources/images/printer_sync_not.svg index 225b67a5fc..5d5855c1f6 100644 --- a/resources/images/printer_sync_not.svg +++ b/resources/images/printer_sync_not.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/printer_sync_ok.svg b/resources/images/printer_sync_ok.svg index 4312185601..684a291cd1 100644 --- a/resources/images/printer_sync_ok.svg +++ b/resources/images/printer_sync_ok.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/slic3r/GUI/ImageDPIFrame.cpp b/src/slic3r/GUI/ImageDPIFrame.cpp index df4e516d4d..06c3f59c3f 100644 --- a/src/slic3r/GUI/ImageDPIFrame.cpp +++ b/src/slic3r/GUI/ImageDPIFrame.cpp @@ -146,7 +146,6 @@ void ImageDPIFrame::on_hide() wxGetApp().mainframe->Raise(); } } - set_title(""); // reset title on hide } } // namespace GUI diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 37a3214d7c..855788f1ff 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -214,6 +214,7 @@ wxDEFINE_EVENT(EVT_NOTICE_CHILDE_SIZE_CHANGED, SimpleEvent); wxDEFINE_EVENT(EVT_NOTICE_FULL_SCREEN_CHANGED, IntEvent); #define PRINTER_THUMBNAIL_SIZE (wxSize(40, 40)) // ORCA #define PRINTER_PANEL_SIZE ( wxSize(70, 60)) // ORCA +#define PRINTER_PANEL_RADIUS (6) // ORCA #define BTN_SYNC_SIZE (wxSize(FromDIP(96), FromDIP(98))) static string get_diameter_string(float diameter) @@ -245,12 +246,12 @@ void Plater::show_illegal_characters_warning(wxWindow* parent) } static std::map bed_type_thumbnails = { - {BedType::btPC, "bed_plate_cool_smooth" }, //"bed_cool"}, - {BedType::btEP, "bed_plate_engineering" }, //"bed_engineering"}, - {BedType::btPEI, "bed_plate_high_temp_smooth"}, //"bed_high_templ"}, - {BedType::btPTE, "bed_plate_pei" }, //"bed_pei"}, - {BedType::btPCT, "bed_plate_cool_textured" }, //"bed_pei"}, // TODO: Orca hack - {BedType::btSuperTack, "bed_plate_cool_supertack" } //"bed_cool_supertack"} + {BedType::btPC, "bed_cool" }, + {BedType::btEP, "bed_engineering" }, + {BedType::btPEI, "bed_high_templ" }, + {BedType::btPTE, "bed_pei" }, + {BedType::btPCT, "bed_pei_cool" }, + {BedType::btSuperTack, "bed_cool_supertack" } }; enum SlicedInfoIdx @@ -544,7 +545,7 @@ void Sidebar::priv::layout_printer(bool isBBL, bool isDual) //hsizer_printer->Add(btn_sync_printer , 0, wxLEFT, FromDIP(4)); vsizer_printer->AddSpacer(FromDIP(SidebarProps::ContentMarginV())); vsizer_printer->Add(hsizer_printer, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(SidebarProps::ContentMargin())); - vsizer_printer->AddSpacer(FromDIP(SidebarProps::ContentMarginV())); + // Printer - extruder // double @@ -559,7 +560,9 @@ void Sidebar::priv::layout_printer(bool isBBL, bool isDual) extruder_sizer->Add(extruder_dual_sizer , 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(SidebarProps::ContentMargin())); extruder_sizer->Add(extruder_single_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(SidebarProps::ContentMargin())); - vsizer_printer->Add(extruder_sizer, 1, wxEXPAND | wxBOTTOM, FromDIP(8)); + vsizer_printer->Add(extruder_sizer, 1, wxEXPAND | wxTOP, FromDIP(2)); + + vsizer_printer->AddSpacer(FromDIP(SidebarProps::ContentMarginV())); } //btn_connect_printer->Show(!isBBL); @@ -576,7 +579,7 @@ void Sidebar::priv::layout_printer(bool isBBL, bool isDual) // NEEDFIX requires AMS check or any type of ??? // Single nozzle & non ams - panel_nozzle_dia->Show(!isDual); + panel_nozzle_dia->Show(!isDual && preset_bundle.get_printer_extruder_count() < 2); extruder_single_sizer->Show(false); } @@ -992,6 +995,7 @@ ExtruderGroup::ExtruderGroup(wxWindow * parent, int index, wxString const &title SetFont(Label::Body_10); SetForegroundColour(wxColour("#CECECE")); SetBorderColor(wxColour("#EEEEEE")); + SetCornerRadius(FromDIP(PRINTER_PANEL_RADIUS)); // ORCA match radius with other boxes ShowBadge(true); // Nozzle wxStaticText *label_diameter = new wxStaticText(this, wxID_ANY, _L("Diameter")); @@ -1096,8 +1100,8 @@ ExtruderGroup::ExtruderGroup(wxWindow * parent, int index, wxString const &title this->sizer = hsizer; } else { wxStaticBoxSizer *vsizer = new wxStaticBoxSizer(this, wxVERTICAL); - vsizer->Add(hsizer_ams, 0, wxEXPAND | wxLEFT | wxTOP | wxRIGHT, FromDIP(2)); - vsizer->Add(hsizer_diameter, 0, wxEXPAND | wxLEFT | wxTOP | wxRIGHT, FromDIP(2)); + vsizer->Add(hsizer_ams, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(2)); + vsizer->Add(hsizer_diameter, 0, wxEXPAND | wxLEFT | wxTOP | wxRIGHT | wxBOTTOM, FromDIP(2)); //vsizer->Add(hsizer_nozzle, 0, wxEXPAND | wxALL, FromDIP(2)); this->sizer = vsizer; } @@ -1359,6 +1363,7 @@ void Sidebar::priv::update_sync_status(const MachineObject *obj) auto clear_all_sync_status = [this, ¬_synced_colour]() { panel_printer_preset->ShowBadge(false); panel_printer_bed->ShowBadge(false); + panel_nozzle_dia->ShowBadge(false); // ORCA add support for nozzle sync left_extruder->ShowBadge(false); left_extruder->sync_ams(nullptr, {}, {}); right_extruder->ShowBadge(false); @@ -1486,11 +1491,13 @@ void Sidebar::priv::update_sync_status(const MachineObject *obj) if (extruder_nums == 1) { if (is_same_nozzle_info(extruder_infos[0], machine_extruder_infos[0])) { single_extruder->ShowBadge(true); + panel_nozzle_dia->ShowBadge(true); // ORCA add support for nozzle sync single_extruder->sync_ams(obj, machine_extruder_infos[0].ams_v4, machine_extruder_infos[0].ams_v1); extruder_synced[0] = true; } else { single_extruder->ShowBadge(false); + panel_nozzle_dia->ShowBadge(false); // ORCA add support for nozzle sync single_extruder->sync_ams(obj, {}, {}); } } @@ -1664,62 +1671,69 @@ Sidebar::Sidebar(Plater *parent) p->m_panel_printer_content = new wxPanel(p->scrolled, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); p->m_panel_printer_content->SetBackgroundColour(wxColour(255, 255, 255)); - StateColor panel_bd_col(std::pair(wxColour("#009688"), StateColor::Pressed), - std::pair(wxColour("#009688"), StateColor::Hovered), - std::pair(wxColour("#DBDBDB"), StateColor::Normal)); + + struct PanelColors { + wxColour bg_normal = "#FFFFFF"; + wxColour bg_focus = "#E5F0EE"; + wxColour bd_normal = "#DBDBDB"; + wxColour bd_hover = "#009688"; + wxColour bd_focus = "#009688"; + }; + PanelColors panel_color; p->panel_printer_preset = new StaticBox(p->m_panel_printer_content); - p->panel_printer_preset->SetCornerRadius(FromDIP(8)); - p->panel_printer_preset->SetBorderColor(panel_bd_col); + p->panel_printer_preset->SetCornerRadius(FromDIP(PRINTER_PANEL_RADIUS)); + p->panel_printer_preset->SetBorderColor(panel_color.bd_normal); p->panel_printer_preset->SetMinSize(FromDIP(PRINTER_PANEL_SIZE)); p->panel_printer_preset->Bind(wxEVT_LEFT_DOWN, [this](auto & evt) { p->combo_printer->wxEvtHandler::ProcessEvent(evt); }); // ORCA Hide Cover automatically if there is not enough space p->panel_printer_preset->Bind(wxEVT_SIZE, [this](auto & e) { - bool is_narrow = e.GetSize().GetWidth() < p->scrolled->FromDIP(235); - if(is_narrow && p->image_printer->IsShown()) + auto current_width = e.GetSize().GetWidth(); + auto narrow_width = FromDIP(235); + auto label_width = p->combo_printer->GetTextExtent(p->combo_printer->GetStringSelection()).GetWidth(); + auto min_width = label_width + FromDIP(25 + PRINTER_PANEL_SIZE.GetWidth()); + if(((min_width < narrow_width && min_width > current_width) || (current_width < narrow_width && min_width > narrow_width)) && p->image_printer->IsShown()) p->image_printer->Hide(); - else if(!is_narrow && !p->image_printer->IsShown()) + else if((current_width > min_width || !(current_width < narrow_width)) && !p->image_printer->IsShown()) p->image_printer->Show(); e.Skip(); }); - ScalableButton *edit_btn = new ScalableButton(p->panel_printer_preset, wxID_ANY, "edit"); - edit_btn->SetToolTip(_L("Click to edit preset")); - edit_btn->Hide(); // hide for first launch - edit_btn->Bind(wxEVT_BUTTON, [this](wxCommandEvent) - { - p->editing_filament = -1; - if (p->combo_printer->switch_to_tab()) - p->editing_filament = 0; - }); - p->btn_edit_printer = edit_btn; + p->btn_edit_printer = new ScalableButton(p->panel_printer_preset, wxID_ANY, "edit"); + p->btn_edit_printer->SetToolTip(_L("Click to edit preset")); + p->btn_edit_printer->Hide(); // hide for first launch + p->btn_edit_printer->Bind(wxEVT_BUTTON, [this, panel_color](wxCommandEvent){ + p->editing_filament = -1; + if (p->combo_printer->switch_to_tab()) + p->editing_filament = 0; + // ORCA clicking edit button not triggers wxEVT_KILL_FOCUS wxEVT_LEAVE_WINDOW make changes manually to prevent stucked colors when opening printer settings + p->panel_printer_preset->SetBorderColor(panel_color.bd_normal); + p->btn_edit_printer->Hide(); + p->panel_printer_preset->Layout(); + }); + ScalableBitmap bitmap_printer(p->panel_printer_preset, "printer_placeholder", PRINTER_THUMBNAIL_SIZE.GetHeight()); p->image_printer = new wxStaticBitmap(p->panel_printer_preset, wxID_ANY, bitmap_printer.bmp(), wxDefaultPosition, FromDIP(PRINTER_THUMBNAIL_SIZE), 0); p->image_printer->Bind(wxEVT_LEFT_DOWN, [this](auto &evt) { p->combo_printer->wxEvtHandler::ProcessEvent(evt); }); - PlaterPresetComboBox *combo_printer = new PlaterPresetComboBox(p->panel_printer_preset, Preset::TYPE_PRINTER); - //combo_printer->SetWindowStyle(combo_printer->GetWindowStyle() & ~wxALIGN_MASK | wxALIGN_CENTER_HORIZONTAL); - combo_printer->SetBorderWidth(0); - p->combo_printer = combo_printer; + p->combo_printer = new PlaterPresetComboBox(p->panel_printer_preset, Preset::TYPE_PRINTER); + p->combo_printer->SetBorderWidth(0); + p->combo_printer->SetMaxSize(wxSize(-1, FromDIP(30))); // limiting height makes badge visible // ORCA paint whole combobox on focus - auto printer_focus_bg = [this, panel_bd_col](bool focused){ - auto bg_color = StateColor::darkModeColorFor(wxColour(focused ? "#E5F0EE" : "#FFFFFF")); - auto panel = p->panel_printer_preset; - panel->SetBackgroundColor(bg_color); - if(focused) - panel->SetBorderColor(wxColour("#009688")); - else - panel->SetBorderColor(panel_bd_col); + auto printer_focus_bg = [this, panel_color](bool focused){ + auto bg_color = StateColor::darkModeColorFor(focused ? panel_color.bg_focus : panel_color.bg_normal); + p->panel_printer_preset->SetBackgroundColor(bg_color); + p->panel_printer_preset->SetBorderColor(focused ? panel_color.bd_focus : panel_color.bd_normal); p->btn_edit_printer->SetBackgroundColour(bg_color); p->image_printer->SetBackgroundColour(bg_color); p->combo_printer->SetBackgroundColour(bg_color); // paints margins instead combo background }; - combo_printer->Bind(wxEVT_SET_FOCUS, [this, printer_focus_bg](auto& e) {printer_focus_bg(true ); e.Skip();}); - combo_printer->Bind(wxEVT_KILL_FOCUS, [this, printer_focus_bg](auto& e) {printer_focus_bg(false); e.Skip();}); + p->combo_printer->Bind(wxEVT_SET_FOCUS, [this, printer_focus_bg](auto& e) {printer_focus_bg(true ); e.Skip();}); + p->combo_printer->Bind(wxEVT_KILL_FOCUS, [this, printer_focus_bg](auto& e) {printer_focus_bg(false); e.Skip();}); /* ORCA This part moved to titlebar p->btn_connect_printer = new ScalableButton(p->panel_printer_preset, wxID_ANY, "monitor_signal_strong"); @@ -1731,45 +1745,40 @@ Sidebar::Sidebar(Plater *parent) dlg.ShowModal(); }); */ - { - // ORCA use Show/Hide to gain text area instead using blank icon + // ORCA use Show/Hide to gain text area instead using blank icon. also manages hover effect for border for (wxWindow *w : std::initializer_list{p->panel_printer_preset, p->btn_edit_printer, p->image_printer, p->combo_printer}) { - w->Bind(wxEVT_ENTER_WINDOW, [this](wxMouseEvent &e) { + w->Bind(wxEVT_ENTER_WINDOW, [this, panel_color](wxMouseEvent &e) { if(!p->combo_printer->HasFocus()) - p->panel_printer_preset->SetBorderColor(wxColour("#009688")); + p->panel_printer_preset->SetBorderColor(panel_color.bd_hover); if(!p->btn_edit_printer->IsShown()){ p->btn_edit_printer->Show(); p->panel_printer_preset->Layout(); } e.Skip(); }); - w->Bind(wxEVT_LEAVE_WINDOW, [this, panel_bd_col](wxMouseEvent &e) { + w->Bind(wxEVT_LEAVE_WINDOW, [this, panel_color](wxMouseEvent &e) { wxWindow* next_w = wxFindWindowAtPoint(wxGetMousePosition()); - if (!next_w || (next_w != p->panel_printer_preset && next_w != p->btn_edit_printer && next_w != p->image_printer && next_w != p->combo_printer)){ + if (!next_w || !p->panel_printer_preset->IsDescendant(next_w)){ if(!p->combo_printer->HasFocus()) - p->panel_printer_preset->SetBorderColor(panel_bd_col); + p->panel_printer_preset->SetBorderColor(panel_color.bd_normal); p->btn_edit_printer->Hide(); p->panel_printer_preset->Layout(); } e.Skip(); }); } - } // ORCA unified Nozzle diameter selection p->panel_nozzle_dia = new StaticBox(p->m_panel_printer_content); - p->panel_nozzle_dia->SetCornerRadius(FromDIP(8)); - p->panel_nozzle_dia->SetBorderColor(panel_bd_col); + p->panel_nozzle_dia->SetCornerRadius(FromDIP(PRINTER_PANEL_RADIUS)); + p->panel_nozzle_dia->SetBorderColor(panel_color.bd_normal); p->panel_nozzle_dia->SetMinSize(FromDIP(PRINTER_PANEL_SIZE)); p->panel_nozzle_dia->Bind(wxEVT_LEFT_DOWN, [this](auto & evt) { p->combo_nozzle_dia->wxEvtHandler::ProcessEvent(evt); }); - p->label_nozzle_title = new Label(p->panel_nozzle_dia, _L("Nozzle")); + p->label_nozzle_title = new Label(p->panel_nozzle_dia, _L("Nozzle"), LB_PROPAGATE_MOUSE_EVENT); p->label_nozzle_title->SetFont(Label::Body_10); - p->label_nozzle_title->Bind(wxEVT_LEFT_DOWN, [this](auto & evt) { - p->combo_nozzle_dia->wxEvtHandler::ProcessEvent(evt); - }); p->combo_nozzle_dia = new ComboBox(p->panel_nozzle_dia, wxID_ANY, wxString(""), wxDefaultPosition, wxDefaultSize, 0, nullptr, wxCB_READONLY); p->combo_nozzle_dia->SetBorderWidth(0); @@ -1786,14 +1795,10 @@ Sidebar::Sidebar(Plater *parent) e.Skip(); }); // ORCA paint whole combobox on focus - auto nozzle_focus_bg = [this, panel_bd_col](bool focused){ - auto bg_color = StateColor::darkModeColorFor(wxColour(focused ? "#E5F0EE" : "#FFFFFF")); - auto panel = p->panel_nozzle_dia; - panel->SetBackgroundColor(bg_color); - if(focused) - panel->SetBorderColor(wxColour("#009688")); - else - panel->SetBorderColor(panel_bd_col); + auto nozzle_focus_bg = [this, panel_color](bool focused){ + auto bg_color = StateColor::darkModeColorFor(focused ? panel_color.bg_focus : panel_color.bg_normal); + p->panel_nozzle_dia->SetBackgroundColor(bg_color); + p->panel_nozzle_dia->SetBorderColor(focused ? panel_color.bd_focus : panel_color.bd_normal); p->label_nozzle_title->SetBackgroundColour(bg_color); p->label_nozzle_type->SetBackgroundColour(bg_color); p->combo_nozzle_dia->SetBackgroundColour(bg_color); // paints margins instead combo background @@ -1801,13 +1806,25 @@ Sidebar::Sidebar(Plater *parent) p->combo_nozzle_dia->Bind(wxEVT_SET_FOCUS, [this, nozzle_focus_bg](auto& e) {nozzle_focus_bg(true ); e.Skip();}); p->combo_nozzle_dia->Bind(wxEVT_KILL_FOCUS, [this, nozzle_focus_bg](auto& e) {nozzle_focus_bg(false); e.Skip();}); - p->label_nozzle_type = new Label(p->panel_nozzle_dia, "Brass", wxST_ELLIPSIZE_END | wxALIGN_CENTRE_HORIZONTAL); + p->label_nozzle_type = new Label(p->panel_nozzle_dia, "Brass", LB_PROPAGATE_MOUSE_EVENT | wxST_ELLIPSIZE_END | wxALIGN_CENTRE_HORIZONTAL); p->label_nozzle_type->SetFont(Label::Body_10); p->label_nozzle_type->SetMinSize(FromDIP(wxSize(56, -1))); p->label_nozzle_type->SetMaxSize(FromDIP(wxSize(56, -1))); - p->label_nozzle_type->Bind(wxEVT_LEFT_DOWN, [this](auto & evt) { - p->combo_nozzle_dia->wxEvtHandler::ProcessEvent(evt); - }); + + // highlight border on hover + for (wxWindow *w : std::initializer_list{p->panel_nozzle_dia, p->label_nozzle_title, p->label_nozzle_type, p->combo_nozzle_dia}) { + w->Bind(wxEVT_ENTER_WINDOW, [this, panel_color](wxMouseEvent &e) { + if(!p->combo_nozzle_dia->HasFocus()) + p->panel_nozzle_dia->SetBorderColor(panel_color.bd_hover); + e.Skip(); + }); + w->Bind(wxEVT_LEAVE_WINDOW, [this, panel_color](wxMouseEvent &e) { + wxWindow* next_w = wxFindWindowAtPoint(wxGetMousePosition()); + if (!p->combo_nozzle_dia->HasFocus() && (!next_w || !p->panel_nozzle_dia->IsDescendant(next_w))) + p->panel_nozzle_dia->SetBorderColor(panel_color.bd_normal); + e.Skip(); + }); + } wxGridSizer *nozzle_dia_sizer = new wxGridSizer(3, 1, FromDIP(2), 0); nozzle_dia_sizer->Add(p->label_nozzle_title, 0, wxALIGN_CENTER | wxTOP, FromDIP(4)); @@ -1818,10 +1835,11 @@ Sidebar::Sidebar(Plater *parent) // Bed type selection p->panel_printer_bed = new StaticBox(p->m_panel_printer_content); - p->panel_printer_bed->SetCornerRadius(FromDIP(8)); - p->panel_printer_bed->SetBorderColor(panel_bd_col); + p->panel_printer_bed->SetCornerRadius(FromDIP(PRINTER_PANEL_RADIUS)); + p->panel_printer_bed->SetBorderColor(panel_color.bd_normal); p->panel_printer_bed->SetMinSize(FromDIP(PRINTER_PANEL_SIZE)); p->panel_printer_bed->Bind(wxEVT_LEFT_DOWN, [this](auto &evt) { + on_leave_image_printer_bed(evt); p->combo_printer_bed->wxEvtHandler::ProcessEvent(evt); }); @@ -1833,10 +1851,7 @@ Sidebar::Sidebar(Plater *parent) ScalableBitmap bitmap_bed(p->panel_printer_bed, "printer_placeholder", PRINTER_THUMBNAIL_SIZE.GetHeight()); p->image_printer_bed = new wxStaticBitmap(p->panel_printer_bed, wxID_ANY, bitmap_bed.bmp(), wxDefaultPosition, wxDefaultSize, 0); p->image_printer_bed->Bind(wxEVT_LEFT_DOWN, [this](auto &evt) { - p->image_printer_bed->Unbind(wxEVT_LEAVE_WINDOW, &Sidebar::on_leave_image_printer_bed, this); - if (p->big_bed_image_popup) { - p->big_bed_image_popup->on_hide(); - } + on_leave_image_printer_bed(evt); p->combo_printer_bed->wxEvtHandler::ProcessEvent(evt); }); @@ -1848,37 +1863,41 @@ Sidebar::Sidebar(Plater *parent) reset_bed_type_combox_choices(true); p->combo_printer_bed->Bind(wxEVT_COMBOBOX, [this](auto &e) { - bool isDual = static_cast(p->panel_printer_preset->GetSizer())->GetOrientation() == wxVERTICAL; auto image_path = get_cur_select_bed_image(); p->image_printer_bed->SetBitmap(create_scaled_bitmap(image_path, this, PRINTER_THUMBNAIL_SIZE.GetHeight())); - if (p->big_bed_image_popup) { - p->big_bed_image_popup->set_bitmap(create_scaled_bitmap("big_" + image_path, p->big_bed_image_popup, p->big_bed_image_popup->get_image_px())); - p->big_bed_image_popup->set_title(p->combo_printer_bed->GetString(p->combo_printer_bed->GetSelection())); - } - e.Skip(); // fix bug:Event spreads to sidebar + e.Skip(); }); - p->combo_printer_bed->Bind(wxEVT_LEAVE_WINDOW, [this](wxMouseEvent &evt) { - if (p->big_bed_image_popup) { - p->big_bed_image_popup->on_hide(); - } - }); - p->image_printer_bed->Bind(wxEVT_ENTER_WINDOW, &Sidebar::on_enter_image_printer_bed, this); // ORCA paint whole combobox on focus - auto bed_focus_bg = [this, panel_bd_col](bool focused){ - auto bg_color = StateColor::darkModeColorFor(wxColour(focused ? "#E5F0EE" : "#FFFFFF")); - auto panel = p->panel_printer_bed; - panel->SetBackgroundColor(bg_color); - if(focused) - panel->SetBorderColor(wxColour("#009688")); - else - panel->SetBorderColor(panel_bd_col); + auto bed_focus_bg = [this, panel_color](bool focused){ + auto bg_color = StateColor::darkModeColorFor(focused ? panel_color.bg_focus : panel_color.bg_normal); + p->panel_printer_bed->SetBackgroundColor(bg_color); + p->panel_printer_bed->SetBorderColor(focused ? panel_color.bd_focus : panel_color.bd_normal); p->image_printer_bed->SetBackgroundColour(bg_color); p->combo_printer_bed->SetBackgroundColour(bg_color); // paints margins instead combo background }; p->combo_printer_bed->Bind(wxEVT_SET_FOCUS, [this, bed_focus_bg](auto& e) {bed_focus_bg(true ); e.Skip();}); p->combo_printer_bed->Bind(wxEVT_KILL_FOCUS, [this, bed_focus_bg](auto& e) {bed_focus_bg(false); e.Skip();}); + // highlight border on hover + for (wxWindow *w : std::initializer_list{p->panel_printer_bed, p->image_printer_bed, p->combo_printer_bed}) { + w->Bind(wxEVT_ENTER_WINDOW, [this, w, panel_color](wxMouseEvent &e) { + if(!p->combo_printer_bed->HasFocus()) + p->panel_printer_bed->SetBorderColor(panel_color.bd_hover); + if(w == p->image_printer_bed && !p->combo_printer_bed->is_drop_down()) // dont trigger while combo open + on_enter_image_printer_bed(e); + e.Skip(); + }); + w->Bind(wxEVT_LEAVE_WINDOW, [this, w, panel_color](wxMouseEvent &e) { + wxWindow* next_w = wxFindWindowAtPoint(wxGetMousePosition()); + if (!p->combo_printer_bed->HasFocus() && (!next_w || !p->panel_printer_bed->IsDescendant(next_w))) + p->panel_printer_bed->SetBorderColor(panel_color.bd_normal); + if(w == p->image_printer_bed) + on_leave_image_printer_bed(e); + e.Skip(); + }); + } + wxBoxSizer *bed_type_sizer = new wxBoxSizer(wxHORIZONTAL); bed_type_sizer->Add(p->combo_printer_bed, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(2)); bed_type_sizer->Add(p->image_printer_bed, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(2)); @@ -2200,15 +2219,14 @@ Sidebar::Sidebar(Plater *parent) Sidebar::~Sidebar() {} void Sidebar::on_enter_image_printer_bed(wxMouseEvent &evt) { - p->image_printer_bed->Bind(wxEVT_LEAVE_WINDOW, &Sidebar::on_leave_image_printer_bed, this); + //p->image_printer_bed->Bind(wxEVT_LEAVE_WINDOW, &Sidebar::on_leave_image_printer_bed, this); auto pos = p->panel_printer_bed->GetScreenPosition(); auto rect = p->panel_printer_bed->GetRect(); wxPoint temp_pos(pos.x + rect.GetWidth() + FromDIP(3), pos.y); - if (p->big_bed_image_popup == nullptr) { + if (p->big_bed_image_popup == nullptr) p->big_bed_image_popup = new ImageDPIFrame(); - auto image_path = get_cur_select_bed_image(); - p->big_bed_image_popup->set_bitmap(create_scaled_bitmap("big_" + image_path, p->big_bed_image_popup, p->big_bed_image_popup->get_image_px())); - } + auto image_path = get_cur_select_bed_image(); + p->big_bed_image_popup->set_bitmap(create_scaled_bitmap("big_" + image_path, p->big_bed_image_popup, p->big_bed_image_popup->get_image_px())); p->big_bed_image_popup->set_title(p->combo_printer_bed->GetString(p->combo_printer_bed->GetSelection())); p->big_bed_image_popup->SetCanFocus(false); p->big_bed_image_popup->SetPosition(temp_pos); @@ -2216,11 +2234,15 @@ void Sidebar::on_enter_image_printer_bed(wxMouseEvent &evt) { } void Sidebar::on_leave_image_printer_bed(wxMouseEvent &evt) { - auto pos_x = evt.GetX(); - auto pos_y = evt.GetY(); - auto rect = p->image_printer_bed->GetRect(); - if ((pos_x <= 0 || pos_y <= 0 || pos_x >= rect.GetWidth()) && p->big_bed_image_popup) { + //auto pos_x = evt.GetX(); + //auto pos_y = evt.GetY(); + //auto rect = p->image_printer_bed->GetRect(); + //if ((pos_x <= 0 || pos_y <= 0 || pos_x >= rect.GetWidth()) && p->big_bed_image_popup) { + if (p->big_bed_image_popup) { + bool was_visible = p->big_bed_image_popup->IsShown(); p->big_bed_image_popup->on_hide(); + if(!p->combo_printer_bed->is_drop_down() && was_visible) + p->combo_printer_bed->SetFocus(); // set focus back to bed type combo. this prevents weird look if focus on other item } } void Sidebar::on_change_color_mode(bool is_dark) { @@ -2731,18 +2753,19 @@ void Sidebar::msw_rescale() p->m_printer_setting->msw_rescale(); p->panel_printer_preset->SetMinSize(FromDIP(PRINTER_PANEL_SIZE)); - p->panel_printer_preset->SetCornerRadius(FromDIP(8)); + p->panel_printer_preset->SetCornerRadius(FromDIP(PRINTER_PANEL_RADIUS)); p->image_printer->SetSize(FromDIP(PRINTER_THUMBNAIL_SIZE)); update_printer_thumbnail(); p->combo_printer->Rescale(); + p->combo_printer->SetMaxSize(wxSize(-1, FromDIP(30))); // limiting height makes badge visible p->btn_edit_printer->msw_rescale(); p->panel_nozzle_dia->SetMinSize(FromDIP(PRINTER_PANEL_SIZE)); - p->panel_nozzle_dia->SetCornerRadius(FromDIP(8)); + p->panel_nozzle_dia->SetCornerRadius(FromDIP(PRINTER_PANEL_RADIUS)); p->combo_nozzle_dia->Rescale(); p->panel_printer_bed->SetMinSize(FromDIP(PRINTER_PANEL_SIZE)); - p->panel_printer_bed->SetCornerRadius(FromDIP(8)); + p->panel_printer_bed->SetCornerRadius(FromDIP(PRINTER_PANEL_RADIUS)); p->combo_printer_bed->Rescale(); p->combo_printer_bed->SetMinSize(FromDIP(wxSize(18,-1))); // ORCA show only arrow p->combo_printer_bed->SetMaxSize(FromDIP(wxSize(18,-1))); // ORCA show only arrow @@ -2873,6 +2896,13 @@ void Sidebar::sys_color_changed() p->image_printer->SetSize(FromDIP(PRINTER_THUMBNAIL_SIZE)); p->image_printer_bed->SetSize(FromDIP(PRINTER_THUMBNAIL_SIZE)); + // call a kill focus event to ensure new colors applied + for (ComboBox* combo : std::vector{p->combo_printer, p->combo_nozzle_dia, p->combo_printer_bed}){ + wxFocusEvent fakeEvent(wxEVT_KILL_FOCUS); + fakeEvent.SetEventObject(combo); + combo->HandleWindowEvent(fakeEvent); + } + // BBS obj_list()->sys_color_changed(); obj_layers()->sys_color_changed(); diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index 2754580e7c..e5d3ffae6e 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -5121,40 +5121,42 @@ void PrinterInfoBox::UpdatePlate(const std::string& plate_name) { if (plate_name.empty()) { - m_text_bed_type->Hide(); + //m_text_bed_type->Hide(); } else { wxString name; if (plate_name == "Cool Plate") { - name = _L("Cool"); - m_bed_image->SetBitmap(create_scaled_bitmap("bed_cool", this, 32)); + name = _L("Smooth Cool Plate"); + m_bed_image->SetBitmap(create_scaled_bitmap("bed_cool", this, 40)); } else if (plate_name == "Engineering Plate") { - name = _L("Engineering"); - m_bed_image->SetBitmap(create_scaled_bitmap("bed_engineering", this, 32)); + name = _L("Engineering Plate"); + m_bed_image->SetBitmap(create_scaled_bitmap("bed_engineering", this, 40)); } else if (plate_name == "High Temp Plate") { - name = _L("High Temp"); - m_bed_image->SetBitmap(create_scaled_bitmap("bed_high_templ", this, 32)); + name = _L("Smooth High Temp Plate"); + m_bed_image->SetBitmap(create_scaled_bitmap("bed_high_templ", this, 40)); } else if (plate_name == "Textured PEI Plate") { - name = "PEI"; - m_bed_image->SetBitmap(create_scaled_bitmap("bed_pei", this, 32)); + name = _L("Textured PEI Plate"); + m_bed_image->SetBitmap(create_scaled_bitmap("bed_pei", this, 40)); } else if (plate_name == "Supertack Plate") { - name = _L("Cool(Supertack)"); - m_bed_image->SetBitmap(create_scaled_bitmap("bed_cool_supertack", this, 32)); + name = _L("Cool Plate (Supertack)"); + m_bed_image->SetBitmap(create_scaled_bitmap("bed_cool_supertack", this, 40)); } - if (name.length() > 8) { - m_text_bed_type->SetFont(Label::Body_9); - } - else{ - m_text_bed_type->SetFont(Label::Body_12); - } - m_text_bed_type->SetLabelText(name); - m_text_bed_type->Show(); + m_bed_image->SetToolTip(name); + + //if (name.length() > 8) { + // m_text_bed_type->SetFont(Label::Body_9); + //} + //else{ + // m_text_bed_type->SetFont(Label::Body_12); + //} + //m_text_bed_type->SetLabelText(name); + //m_text_bed_type->Show(); } } @@ -5304,24 +5306,26 @@ void PrinterInfoBox::Create() /*bed area*/ auto bed_staticbox = new StaticBox(this); - bed_staticbox->SetMinSize(wxSize(FromDIP(98), FromDIP(68))); - bed_staticbox->SetMaxSize(wxSize(FromDIP(98), FromDIP(68))); + bed_staticbox->SetMinSize(wxSize(FromDIP(68), FromDIP(68))); + bed_staticbox->SetMaxSize(wxSize(FromDIP(68), FromDIP(68))); bed_staticbox->SetBorderColor(wxColour("#EEEEEE")); - m_bed_image = new wxStaticBitmap(bed_staticbox, wxID_ANY, create_scaled_bitmap("bed_cool", this, 32)); + m_bed_image = new wxStaticBitmap(bed_staticbox, wxID_ANY, create_scaled_bitmap("bed_cool", this, 40)); m_bed_image->SetBackgroundColour(*wxWHITE); - m_bed_image->SetMinSize(wxSize(FromDIP(32), FromDIP(32))); - m_bed_image->SetMaxSize(wxSize(FromDIP(32), FromDIP(32))); + m_bed_image->SetMinSize(wxSize(FromDIP(40), FromDIP(40))); + m_bed_image->SetMaxSize(wxSize(FromDIP(40), FromDIP(40))); - m_text_bed_type = new Label(bed_staticbox); - m_text_bed_type->SetForegroundColour(wxColour(144, 144, 144)); - m_text_bed_type->SetMaxSize(wxSize(FromDIP(80), FromDIP(24))); - m_text_bed_type->SetFont(Label::Body_13); + //m_text_bed_type = new Label(bed_staticbox); + //m_text_bed_type->SetForegroundColour(wxColour(144, 144, 144)); + //m_text_bed_type->SetMaxSize(wxSize(FromDIP(80), FromDIP(24))); + //m_text_bed_type->SetFont(Label::Body_13); - sizer_bed_staticbox->Add(0, 0, 0, wxTOP, FromDIP(10)); + //sizer_bed_staticbox->Add(0, 0, 0, wxTOP, FromDIP(10)); + sizer_bed_staticbox->AddStretchSpacer(); sizer_bed_staticbox->Add(m_bed_image, 0, wxALIGN_CENTER, 0); - sizer_bed_staticbox->AddSpacer(FromDIP(6)); - sizer_bed_staticbox->Add(m_text_bed_type, 0, wxALIGN_CENTER, 0); + sizer_bed_staticbox->AddStretchSpacer(); + //sizer_bed_staticbox->AddSpacer(FromDIP(6)); + //sizer_bed_staticbox->Add(m_text_bed_type, 0, wxALIGN_CENTER, 0); bed_staticbox->SetSizer(sizer_bed_staticbox); bed_staticbox->Layout(); @@ -5333,7 +5337,7 @@ void PrinterInfoBox::Create() wxSizer* main_sizer = new wxBoxSizer(wxVERTICAL); - main_sizer->Add(m_text_bed_type, 0, wxTOP, 0); + //main_sizer->Add(m_text_bed_type, 0, wxTOP, 0); main_sizer->Add(0, 0, 0, wxTOP, FromDIP(15)); main_sizer->Add(sizer_split_printer, 1, wxEXPAND, 0); main_sizer->Add(0, 0, 0, wxTOP, FromDIP(8));