From 752e00694a019238be4cd34a20577d70a683a4dc Mon Sep 17 00:00:00 2001
From: tao wang <tao.wang@bambulab.com>
Date: Tue, 1 Nov 2022 17:55:43 +0800
Subject: [PATCH] FIX:fixed some mall issues

1. The size of the window is scaled to 0.75
2. Add an interface to close publishing pages
3. The host chooses not to judge caching anymore

Change-Id: I8db73a94203ba427059d5121659dfdcd8d4c1940
---
 src/slic3r/GUI/ModelMall.cpp   | 3 +++
 src/slic3r/GUI/ModelMall.hpp   | 6 +++---
 src/slic3r/GUI/Preferences.cpp | 3 ++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/slic3r/GUI/ModelMall.cpp b/src/slic3r/GUI/ModelMall.cpp
index 748511d5114..672016609ed 100644
--- a/src/slic3r/GUI/ModelMall.cpp
+++ b/src/slic3r/GUI/ModelMall.cpp
@@ -152,6 +152,9 @@ namespace GUI {
                 if (download_url.empty()) return;
                 wxGetApp().plater()->request_model_download(download_url, filename);
             }
+            else if(strCmd == "request_close_publish_window") {
+                this->Hide();
+            }
           
         }
         catch (std::exception& e) {
diff --git a/src/slic3r/GUI/ModelMall.hpp b/src/slic3r/GUI/ModelMall.hpp
index e1b49f96de6..330d905b130 100644
--- a/src/slic3r/GUI/ModelMall.hpp
+++ b/src/slic3r/GUI/ModelMall.hpp
@@ -35,9 +35,9 @@
 #include "Widgets/Button.hpp"
 
 
-#define MODEL_MALL_PAGE_SIZE wxSize(FromDIP(1400), FromDIP(1040))
-#define MODEL_MALL_PAGE_CONTROL_SIZE wxSize(FromDIP(1400), FromDIP(40))
-#define MODEL_MALL_PAGE_WEB_SIZE wxSize(FromDIP(1400), FromDIP(1000))
+#define MODEL_MALL_PAGE_SIZE wxSize(FromDIP(1400 * 0.75), FromDIP(1040 * 0.75))
+#define MODEL_MALL_PAGE_CONTROL_SIZE wxSize(FromDIP(1400 * 0.75), FromDIP(40 * 0.75))
+#define MODEL_MALL_PAGE_WEB_SIZE wxSize(FromDIP(1400 * 0.75), FromDIP(1000 * 0.75))
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp
index 3d01850a6a7..81018e88ee6 100644
--- a/src/slic3r/GUI/Preferences.cpp
+++ b/src/slic3r/GUI/Preferences.cpp
@@ -944,7 +944,8 @@ wxBoxSizer* PreferencesDialog::create_debug_page()
             iot_environment_map["pre_host"] = ENV_PRE_HOST;
             iot_environment_map["product_host"] = ENV_PRODUCT_HOST;
 
-            if (iot_environment_map[param] != m_iot_environment_def) {
+            //if (iot_environment_map[param] != m_iot_environment_def) {
+            if (true) {
                 NetworkAgent* agent = wxGetApp().getAgent();
                 if (param == "dev_host") {
                     app_config->set("iot_environment", ENV_DEV_HOST);