GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-09-26 11:43:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

SPE-2507: Resize upload dialogs

Browse Source
This commit is contained in:
David Kocik 2024-10-31 12:06:53 +01:00 committed by Lukas Matena
parent da49e8edfb
commit 40458c6649
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/slic3r/GUI/WebViewDialog.cpp
View File

@ -17,6 +17,7 @@
#include <wx/webview.h> #include <wx/webview.h>
#include <wx/display.h>
#include <boost/log/trivial.hpp> #include <boost/log/trivial.hpp>
#include <boost/property_tree/ptree.hpp> #include <boost/property_tree/ptree.hpp>
@ -436,23 +437,23 @@ PrinterPickWebViewDialog::PrinterPickWebViewDialog(wxWindow* parent, std::string
: WebViewDialog(parent : WebViewDialog(parent
, GUI::from_u8(Utils::ServiceConfig::instance().connect_select_printer_url()) , GUI::from_u8(Utils::ServiceConfig::instance().connect_select_printer_url())
, _L("Choose a printer") , _L("Choose a printer")
, wxSize(parent->GetClientSize().x / 4 * 3, parent->GetClientSize().y/ 5 * 4) , wxSize(parent->GetClientSize().x / 4 * 3, parent->GetClientSize().y/ 4 * 3)
,{"_prusaSlicer"} ,{"_prusaSlicer"}
, "connect_loading") , "connect_loading")
, m_ret_val(ret_val) , m_ret_val(ret_val)
{ {
SetMinSize(wxSize(std::max(parent->GetClientSize().x / 2, 100 * wxGetApp().em_unit()), std::max(parent->GetClientSize().y / 2, 70 * wxGetApp().em_unit())));
wxDisplay display(wxDisplay::GetFromWindow(this));
wxRect geometry = display.GetGeometry();
SetMinSize(wxSize(geometry.GetWidth() / 2, geometry.GetHeight() / 2));
Centre(); Centre();
} }
void PrinterPickWebViewDialog::on_dpi_changed(const wxRect &suggested_rect) void PrinterPickWebViewDialog::on_dpi_changed(const wxRect &suggested_rect)
{ {
wxWindow *parent = GetParent(); wxDisplay display(wxDisplay::GetFromWindow(this));
const wxSize &size = wxSize( wxRect geometry = display.GetGeometry();
std::max(parent->GetClientSize().x / 2, 100 * wxGetApp().em_unit()), SetMinSize(wxSize(geometry.GetWidth() / 2, geometry.GetHeight() / 2));
std::max(parent->GetClientSize().y / 2, 70 * wxGetApp().em_unit())
);
SetMinSize(size);
Fit(); Fit();
Refresh(); Refresh();
} }
@ -634,22 +635,21 @@ PrintablesConnectUploadDialog::PrintablesConnectUploadDialog(wxWindow* parent, c
: WebViewDialog(parent : WebViewDialog(parent
, GUI::from_u8(url) , GUI::from_u8(url)
, _L("Choose a printer") , _L("Choose a printer")
, wxSize(parent->GetClientSize().x / 4 * 3, parent->GetClientSize().y/ 5 * 4) , wxSize(parent->GetClientSize().x / 4 * 3, parent->GetClientSize().y/ 4 * 3)
,{"_prusaSlicer"} ,{"_prusaSlicer"}
, "connect_loading") , "connect_loading")
{ {
SetMinSize(wxSize(std::max(parent->GetClientSize().x / 2, 100 * wxGetApp().em_unit()), std::max(parent->GetClientSize().y / 2, 70 * wxGetApp().em_unit()))); wxDisplay display(wxDisplay::GetFromWindow(this));
wxRect geometry = display.GetGeometry();
SetMinSize(wxSize(geometry.GetWidth() / 2, geometry.GetHeight() / 2));
Centre(); Centre();
} }
void PrintablesConnectUploadDialog::on_dpi_changed(const wxRect &suggested_rect) void PrintablesConnectUploadDialog::on_dpi_changed(const wxRect &suggested_rect)
{ {
wxWindow *parent = GetParent(); wxDisplay display(wxDisplay::GetFromWindow(this));
const wxSize &size = wxSize( wxRect geometry = display.GetGeometry();
std::max(parent->GetClientSize().x / 2, 100 * wxGetApp().em_unit()), SetMinSize(wxSize(geometry.GetWidth() / 2, geometry.GetHeight() / 2));
std::max(parent->GetClientSize().y / 2, 70 * wxGetApp().em_unit())
);
SetMinSize(size);
Fit(); Fit();
Refresh(); Refresh();
} }