From 43bd523753cd5e6a4b1e57fd4f34498b83da0c55 Mon Sep 17 00:00:00 2001 From: "xun.zhang" Date: Sat, 22 Mar 2025 15:55:59 +0800 Subject: [PATCH] FIX: white spaces in dark mode flush table jira: NONE Signed-off-by: xun.zhang Change-Id: I2711af1dc45506906acbcd7215a4005534677310 --- resources/web/flush/WipingDialog.html | 1 + src/slic3r/GUI/WipeTowerDialog.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/resources/web/flush/WipingDialog.html b/resources/web/flush/WipingDialog.html index dc676ae46..3bcc1796f 100644 --- a/resources/web/flush/WipingDialog.html +++ b/resources/web/flush/WipingDialog.html @@ -6,6 +6,7 @@ html, body { margin: 0px; padding: 0px; + height: 100%; background: #f5f5f5; font-family: sans-serif; } diff --git a/src/slic3r/GUI/WipeTowerDialog.cpp b/src/slic3r/GUI/WipeTowerDialog.cpp index 1625dda16..904fc78c6 100644 --- a/src/slic3r/GUI/WipeTowerDialog.cpp +++ b/src/slic3r/GUI/WipeTowerDialog.cpp @@ -102,7 +102,7 @@ WipingDialog::WipingDialog(wxWindow* parent, const std::vector> SetIcon(wxIcon(Slic3r::encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO)); wxBoxSizer* main_sizer = new wxBoxSizer(wxVERTICAL); this->SetSizer(main_sizer); - + this->SetBackgroundColour(*wxWHITE); auto filament_count= wxGetApp().preset_bundle->project_config.option("filament_colour")->values.size(); wxSize extra_size = { FromDIP(100),FromDIP(235) }; if (filament_count <= 2) @@ -132,7 +132,7 @@ WipingDialog::WipingDialog(wxWindow* parent, const std::vector> wxNO_BORDER); m_webview->AddScriptMessageHandler("wipingDialog"); - main_sizer->Add(m_webview, 1); + main_sizer->Add(m_webview, 1, wxEXPAND); fs::path filepath = fs::path(resources_dir()) / "web/flush/WipingDialog.html"; wxString filepath_str = wxString::FromUTF8(filepath.string());