From 93b0adf96475cb889163f588522a3a55114bc4fb Mon Sep 17 00:00:00 2001 From: David Kocik Date: Fri, 25 Oct 2024 12:15:03 +0200 Subject: [PATCH] SPE-2507: Resize Connect upload dialog --- src/slic3r/GUI/WebViewDialog.cpp | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/src/slic3r/GUI/WebViewDialog.cpp b/src/slic3r/GUI/WebViewDialog.cpp index 3279fb5c5f..fe33241109 100644 --- a/src/slic3r/GUI/WebViewDialog.cpp +++ b/src/slic3r/GUI/WebViewDialog.cpp @@ -436,14 +436,27 @@ PrinterPickWebViewDialog::PrinterPickWebViewDialog(wxWindow* parent, std::string : WebViewDialog(parent , GUI::from_u8(Utils::ServiceConfig::instance().connect_select_printer_url()) , _L("Choose a printer") - , wxSize(std::max(parent->GetClientSize().x / 4 * 3, 150 * wxGetApp().em_unit()), std::max(parent->GetClientSize().y / 6 * 5, 100 * wxGetApp().em_unit())) + , wxSize(parent->GetClientSize().x / 4 * 3, parent->GetClientSize().y/ 5 * 4) ,{"_prusaSlicer"} , "connect_loading") , m_ret_val(ret_val) { - SetMinSize(wxSize(std::max(parent->GetClientSize().x / 2, 100 * wxGetApp().em_unit()), std::max(parent->GetClientSize().y / 2, 50 * wxGetApp().em_unit()))); + SetMinSize(wxSize(std::max(parent->GetClientSize().x / 2, 100 * wxGetApp().em_unit()), std::max(parent->GetClientSize().y / 2, 70 * wxGetApp().em_unit()))); Centre(); } + +void PrinterPickWebViewDialog::on_dpi_changed(const wxRect &suggested_rect) +{ + wxWindow *parent = GetParent(); + const wxSize &size = wxSize( + std::max(parent->GetClientSize().x / 2, 100 * wxGetApp().em_unit()), + std::max(parent->GetClientSize().y / 2, 70 * wxGetApp().em_unit()) + ); + SetMinSize(size); + Fit(); + Refresh(); +} + void PrinterPickWebViewDialog::on_show(wxShowEvent& evt) { /* @@ -607,17 +620,7 @@ void PrinterPickWebViewDialog::request_compatible_printers_SLA() wxString script = GUI::format_wxstr("window._prusaConnect_v1.requestCompatiblePrinter(%1%)", request); run_script(script); } -void PrinterPickWebViewDialog::on_dpi_changed(const wxRect &suggested_rect) -{ - wxWindow *parent = GetParent(); - const wxSize &size = wxSize( - std::max(parent->GetClientSize().x / 2, 100 * wxGetApp().em_unit()), - std::max(parent->GetClientSize().y / 2, 50 * wxGetApp().em_unit()) - ); - SetMinSize(size); - Fit(); - Refresh(); -} + void PrinterPickWebViewDialog::on_reload_event(const std::string& message_data) {