diff --git a/src/slic3r/GUI/GUI_Utils.cpp b/src/slic3r/GUI/GUI_Utils.cpp index 33e2bf649e..43fac34f94 100644 --- a/src/slic3r/GUI/GUI_Utils.cpp +++ b/src/slic3r/GUI/GUI_Utils.cpp @@ -504,12 +504,6 @@ std::deque dialogStack; void fit_in_display(wxTopLevelWindow& window, wxSize desired_size) { - // GTK requires width >= -1 and height > 0 for gtk_window_resize/set_size_request - if (desired_size.GetWidth() < WINDOW_MIN_WIDTH) - desired_size.SetWidth(WINDOW_MIN_WIDTH); - if (desired_size.GetHeight() < WINDOW_MIN_HEIGHT) - desired_size.SetHeight(WINDOW_MIN_HEIGHT); - const auto display_size = wxDisplay(window.GetParent()).GetClientArea(); if (desired_size.GetWidth() > display_size.GetWidth()) { desired_size.SetWidth(display_size.GetWidth() * 4 / 5); diff --git a/src/slic3r/GUI/PrinterCloudAuthDialog.cpp b/src/slic3r/GUI/PrinterCloudAuthDialog.cpp index 2cc364c724..4d29d9b1c1 100644 --- a/src/slic3r/GUI/PrinterCloudAuthDialog.cpp +++ b/src/slic3r/GUI/PrinterCloudAuthDialog.cpp @@ -37,8 +37,7 @@ PrinterCloudAuthDialog::PrinterCloudAuthDialog(wxWindow* parent, PrintHost* host return; } m_browser->Hide(); - // GTK asserts on width < -1 and height <= 0; use minimal size for hidden widget - m_browser->SetSize(1, 1); + m_browser->SetSize(0, 0); // Connect the webview events Bind(wxEVT_WEBVIEW_NAVIGATING, &PrinterCloudAuthDialog::OnNavigationRequest, this, m_browser->GetId()); diff --git a/src/slic3r/GUI/WebGuideDialog.cpp b/src/slic3r/GUI/WebGuideDialog.cpp index 1327156d31..5c405af516 100644 --- a/src/slic3r/GUI/WebGuideDialog.cpp +++ b/src/slic3r/GUI/WebGuideDialog.cpp @@ -134,8 +134,7 @@ GuideFrame::GuideFrame(GUI_App *pGUI, long style) return; } m_browser->Hide(); - // GTK asserts on width < -1 and height <= 0; use minimal size for hidden widget - m_browser->SetSize(1, 1); + m_browser->SetSize(0, 0); SetSizer(topsizer); @@ -497,7 +496,7 @@ void GuideFrame::OnScriptMessage(wxWebViewEvent &evt) } } - wxGetApp().fltviews().reload_all(); + wxGetApp().fltviews().relead_all(); } this->EndModal(wxID_OK); diff --git a/src/slic3r/GUI/WebPresetDialog.cpp b/src/slic3r/GUI/WebPresetDialog.cpp index 07dd13c627..b8f07a3da8 100644 --- a/src/slic3r/GUI/WebPresetDialog.cpp +++ b/src/slic3r/GUI/WebPresetDialog.cpp @@ -138,8 +138,7 @@ WebPresetDialog::WebPresetDialog(GUI_App* pGUI, long style) return; } m_browser->Hide(); - // GTK asserts on width < -1 and height <= 0; use minimal size for hidden widget - m_browser->SetSize(1, 1); + m_browser->SetSize(0, 0); SetSizer(topsizer); diff --git a/src/slic3r/GUI/WebSMUserLoginDialog.cpp b/src/slic3r/GUI/WebSMUserLoginDialog.cpp index 9e7bc28ce4..9cf1474d8a 100644 --- a/src/slic3r/GUI/WebSMUserLoginDialog.cpp +++ b/src/slic3r/GUI/WebSMUserLoginDialog.cpp @@ -75,8 +75,7 @@ SMUserLogin::SMUserLogin(bool isLogout) : wxDialog((wxWindow *) (wxGetApp().main return; } m_browser->Hide(); - // GTK asserts on width < -1 and height <= 0; use minimal size for hidden widget - m_browser->SetSize(1, 1); + m_browser->SetSize(0, 0); // Log backend information // wxLogMessage(wxWebView::GetBackendVersionInfo().ToString()); diff --git a/src/slic3r/GUI/WebUserLoginDialog.cpp b/src/slic3r/GUI/WebUserLoginDialog.cpp index 207cc7a456..f0118926f2 100644 --- a/src/slic3r/GUI/WebUserLoginDialog.cpp +++ b/src/slic3r/GUI/WebUserLoginDialog.cpp @@ -98,8 +98,7 @@ ZUserLogin::ZUserLogin() : wxDialog((wxWindow *) (wxGetApp().mainframe), wxID_AN return; } m_browser->Hide(); - // GTK asserts on width < -1 and height <= 0; use minimal size for hidden widget - m_browser->SetSize(1, 1); + m_browser->SetSize(0, 0); // Log backend information // wxLogMessage(wxWebView::GetBackendVersionInfo().ToString());