From 32276788c7c3d8341fa98f22064faddccfbdba07 Mon Sep 17 00:00:00 2001 From: Kunlong Ma Date: Fri, 19 Apr 2024 19:40:47 +0800 Subject: [PATCH] FIX: fix ui bug in send multi machine page for mac JIRA: STUDIO-6882 Incorrect background color when renaming during multi machine printing Change-Id: I6c551f5023ffe747e7a7e2f5703b0707c9505922 --- src/slic3r/GUI/SendMultiMachinePage.cpp | 9 +++++++-- src/slic3r/GUI/SendMultiMachinePage.hpp | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/SendMultiMachinePage.cpp b/src/slic3r/GUI/SendMultiMachinePage.cpp index 84e370021..ced9fb397 100644 --- a/src/slic3r/GUI/SendMultiMachinePage.cpp +++ b/src/slic3r/GUI/SendMultiMachinePage.cpp @@ -992,12 +992,17 @@ wxPanel* SendMultiMachinePage::create_page() m_text_sizer = new wxBoxSizer(wxVERTICAL); m_text_sizer->Add(m_rename_switch_panel, 0, wxALIGN_CENTER_HORIZONTAL, 0); - m_thumbnail_panel = new ThumbnailPanel(m_title_panel); + m_panel_image = new wxPanel(m_title_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); + m_image_sizer = new wxBoxSizer(wxHORIZONTAL); + m_thumbnail_panel = new ThumbnailPanel(m_panel_image); m_thumbnail_panel->SetSize(wxSize(THUMBNAIL_SIZE, THUMBNAIL_SIZE)); m_thumbnail_panel->SetMinSize(wxSize(THUMBNAIL_SIZE, THUMBNAIL_SIZE)); m_thumbnail_panel->SetMaxSize(wxSize(THUMBNAIL_SIZE, THUMBNAIL_SIZE)); m_thumbnail_panel->SetBackgroundColour(*wxRED); - m_title_sizer->Add(m_thumbnail_panel, 0, wxLEFT, 0); + m_image_sizer->Add(m_thumbnail_panel, 0, wxALIGN_CENTER, 0); + m_panel_image->SetSizer(m_image_sizer); + m_panel_image->Layout(); + m_title_sizer->Add(m_panel_image, 0, wxLEFT, 0); wxBoxSizer* m_sizer_basic = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* m_sizer_basic_time = new wxBoxSizer(wxHORIZONTAL); diff --git a/src/slic3r/GUI/SendMultiMachinePage.hpp b/src/slic3r/GUI/SendMultiMachinePage.hpp index 5935076bc..381190f1b 100644 --- a/src/slic3r/GUI/SendMultiMachinePage.hpp +++ b/src/slic3r/GUI/SendMultiMachinePage.hpp @@ -154,6 +154,8 @@ private: ScalableBitmap* print_weight{ nullptr }; wxBoxSizer* m_thumbnail_sizer{ nullptr }; ThumbnailPanel* m_thumbnail_panel{nullptr}; + wxPanel* m_panel_image{ nullptr }; + wxBoxSizer* m_image_sizer{ nullptr }; // tip when no device wxStaticText* m_tip_text{ nullptr };