From 95c394bc0a047a4914571dd352a42ff84b3b0835 Mon Sep 17 00:00:00 2001 From: "zorro.zhang" Date: Fri, 14 Jun 2024 20:05:14 +0800 Subject: [PATCH] ENH: Not Reset Homepage When Region Not Change JIRA: none Change-Id: Id2da4cb8f694c26036e4756bfc01dbb0c1941ee6 (cherry picked from commit 21a27b32af749601cb5545a59c54b58a8620788c) --- src/slic3r/GUI/WebViewDialog.cpp | 7 +++++++ src/slic3r/GUI/WebViewDialog.hpp | 1 + 2 files changed, 8 insertions(+) diff --git a/src/slic3r/GUI/WebViewDialog.cpp b/src/slic3r/GUI/WebViewDialog.cpp index 2bc78319e..60d30d784 100644 --- a/src/slic3r/GUI/WebViewDialog.cpp +++ b/src/slic3r/GUI/WebViewDialog.cpp @@ -35,6 +35,8 @@ namespace GUI { WebViewPanel::WebViewPanel(wxWindow *parent) : wxPanel(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize) { + m_Region = wxGetApp().app_config->get_country_code(); + wxString UrlLeft = wxString::Format("file://%s/web/homepage3/left.html", from_u8(resources_dir())); wxString UrlRight = wxString::Format("file://%s/web/homepage3/home.html", from_u8(resources_dir())); @@ -269,6 +271,11 @@ WebViewPanel::~WebViewPanel() void WebViewPanel::ResetWholePage() { + std::string tmp_Region = wxGetApp().app_config->get_country_code(); + if (tmp_Region == m_Region) return; + + m_Region = tmp_Region; + //left if (m_browserLeft != nullptr && m_leftfirst) m_browserLeft->Reload(); diff --git a/src/slic3r/GUI/WebViewDialog.hpp b/src/slic3r/GUI/WebViewDialog.hpp index d30a36847..eb92f9c96 100644 --- a/src/slic3r/GUI/WebViewDialog.hpp +++ b/src/slic3r/GUI/WebViewDialog.hpp @@ -127,6 +127,7 @@ public: void update_mode(); private: + std::string m_Region; wxBoxSizer *topsizer;