From 7901e9fbaaa65e4746a16a89791a4a835db0e71e Mon Sep 17 00:00:00 2001
From: "zhou.xu" <zhou.xu@bambulab.com>
Date: Thu, 20 Mar 2025 11:02:49 +0800
Subject: [PATCH] FIX:Optimize button and checkbox resolution adaptation

jira: STUDIO-11003
Change-Id: Ia6325e3069a09cef45643442ad6f6ee929958446
---
 src/slic3r/GUI/SyncAmsInfoDialog.cpp | 24 ++++++++++++++----------
 src/slic3r/GUI/SyncAmsInfoDialog.hpp |  4 ++--
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/slic3r/GUI/SyncAmsInfoDialog.cpp b/src/slic3r/GUI/SyncAmsInfoDialog.cpp
index d166f3463..1b7627c63 100644
--- a/src/slic3r/GUI/SyncAmsInfoDialog.cpp
+++ b/src/slic3r/GUI/SyncAmsInfoDialog.cpp
@@ -21,7 +21,8 @@
 using namespace Slic3r;
 using namespace Slic3r::GUI;
 
-#define BUTTON_SIZE             wxSize(FromDIP(58), FromDIP(24))
+#define OK_BUTTON_SIZE wxSize(FromDIP(90), FromDIP(24))
+#define CANCEL_BUTTON_SIZE wxSize(FromDIP(58), FromDIP(24))
 #define SyncAmsInfoDialogWidth  FromDIP(675)
 #define SyncAmsInfoDialogHeightMIN FromDIP(620)
 #define SyncAmsInfoDialogHeightMIDDLE FromDIP(630)
@@ -1065,8 +1066,8 @@ SyncAmsInfoDialog::SyncAmsInfoDialog(wxWindow *parent, SyncInfo &info) :
         m_button_ok->SetBorderColor(*wxWHITE);
         m_button_ok->SetTextColor(wxColour(0xFFFFFE));
         m_button_ok->SetFont(Label::Body_12);
-        m_button_ok->SetSize(wxSize(FromDIP(90), FromDIP(24)));
-        m_button_ok->SetMinSize(wxSize(FromDIP(90), FromDIP(24)));
+        m_button_ok->SetSize(OK_BUTTON_SIZE);
+        m_button_ok->SetMinSize(OK_BUTTON_SIZE);
         m_button_ok->SetCornerRadius(FromDIP(12));
         bSizer_button->Add(m_button_ok, 0, wxALIGN_RIGHT | wxLEFT | wxTOP, FromDIP(10));
 
@@ -1083,8 +1084,8 @@ SyncAmsInfoDialog::SyncAmsInfoDialog(wxWindow *parent, SyncInfo &info) :
         m_button_cancel->SetBackgroundColor(btn_bg_white);
         m_button_cancel->SetBorderColor(wxColour(38, 46, 48));
         m_button_cancel->SetFont(Label::Body_12);
-        m_button_cancel->SetSize(BUTTON_SIZE);
-        m_button_cancel->SetMinSize(BUTTON_SIZE);
+        m_button_cancel->SetSize(CANCEL_BUTTON_SIZE);
+        m_button_cancel->SetMinSize(CANCEL_BUTTON_SIZE);
         m_button_cancel->SetCornerRadius(FromDIP(12));
         bSizer_button->Add(m_button_cancel, 0, wxALIGN_RIGHT | wxLEFT | wxTOP, FromDIP(10));
 
@@ -2745,7 +2746,8 @@ void SyncAmsInfoDialog::on_dpi_changed(const wxRect &suggested_rect)
 {
     if (ams_mapping_help_icon != nullptr) {
         ams_mapping_help_icon->msw_rescale();
-        if (img_amsmapping_tip) img_amsmapping_tip->SetBitmap(ams_mapping_help_icon->bmp());
+        if (img_amsmapping_tip)
+            img_amsmapping_tip->SetBitmap(ams_mapping_help_icon->bmp());
     }
 
     for (auto material1 : m_materialList) {
@@ -2753,10 +2755,12 @@ void SyncAmsInfoDialog::on_dpi_changed(const wxRect &suggested_rect)
     }
     m_swipe_left_button->msw_rescale();
     m_swipe_right_button->msw_rescale();
-    m_button_ok->Rescale();
-    m_button_cancel->Rescale();
-    m_mapping_popup.msw_rescale();
-
+    m_button_ok->SetMinSize(OK_BUTTON_SIZE);
+    m_button_ok->SetCornerRadius(FromDIP(12));
+    m_button_cancel->SetMinSize(CANCEL_BUTTON_SIZE);
+    m_button_cancel->SetCornerRadius(FromDIP(12));
+    m_merge_color_checkbox->Rescale();
+    m_append_color_checkbox->Rescale();
     Fit();
     Refresh();
 }
diff --git a/src/slic3r/GUI/SyncAmsInfoDialog.hpp b/src/slic3r/GUI/SyncAmsInfoDialog.hpp
index 2c64b9a01..4c427fddf 100644
--- a/src/slic3r/GUI/SyncAmsInfoDialog.hpp
+++ b/src/slic3r/GUI/SyncAmsInfoDialog.hpp
@@ -323,10 +323,10 @@ private:
     wxStaticText *   m_more_setting_tips = nullptr;
     wxStaticBitmap * m_advanced_options_icon{nullptr};
     wxBoxSizer *     m_append_color_sizer = nullptr;
-    CheckBox* m_append_color_checkbox = nullptr;
+    ::CheckBox*      m_append_color_checkbox = nullptr;
     wxStaticText *   m_append_color_text = nullptr;
     wxBoxSizer *     m_merge_color_sizer     = nullptr;
-    CheckBox* m_merge_color_checkbox = nullptr;
+    ::CheckBox*      m_merge_color_checkbox = nullptr;
     wxStaticText *   m_merge_color_text  = nullptr;
     bool m_is_empty_project = true;