From c311404395dba42c9a4be6790d70bf77221a07f6 Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Thu, 14 Sep 2023 17:47:58 +0800
Subject: [PATCH] =?UTF-8?q?windows=E8=AE=BE=E7=BD=AE=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E5=BE=AE=E8=B0=83spinbox=E7=9A=84=E9=95=BF=E5=BA=A6=EF=BC=8C?=
 =?UTF-8?q?=E5=9B=BD=E4=BA=A7=E7=B3=BB=E7=BB=9F=E6=9A=82=E4=B8=8D=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/twainui/hg_settingdialog.cpp | 32 +++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/modules/twainui/hg_settingdialog.cpp b/modules/twainui/hg_settingdialog.cpp
index 8b4737f3..1fa1c06f 100644
--- a/modules/twainui/hg_settingdialog.cpp
+++ b/modules/twainui/hg_settingdialog.cpp
@@ -575,7 +575,13 @@ void hg_settingdialog::createUI()
             case SANE_CONSTRAINT_NONE:
             {
                 QSpinBox* spinBox = new QSpinBox(scrollArea);
+
+#ifdef HG_CMP_MSC
+                spinBox->setMinimumWidth(75);
+#else
                 spinBox->setMinimumWidth(150);
+#endif
+
                 spinBox->setToolTip(opt->desc);
                 spinBox->setRange(1, 1000);
                 int id = i + 1;
@@ -597,8 +603,6 @@ void hg_settingdialog::createUI()
             case SANE_CONSTRAINT_RANGE:
             {
                 QWidget* widget_slider_spin = new QWidget(scrollArea);
-                widget_slider_spin->setMinimumWidth(300);
-
                 QSlider* sliderCreation = new QSlider(widget_slider_spin);
 
                 if (0 == strcmp(opt->name, SANE_STD_OPT_NAME_THRESHOLD) || 0 == strcmp(opt->name, SANE_STD_OPT_NAME_ANTI_NOISE_LEVEL) ||
@@ -608,14 +612,23 @@ void hg_settingdialog::createUI()
                 }
 
                 sliderCreation->setOrientation(Qt::Horizontal);
-                sliderCreation->setMinimumWidth(120);
                 sliderCreation->setRange(opt->constraint.range->min, opt->constraint.range->max);
                 sliderCreation->setToolTip(opt->desc);
                 sliderCreation->setProperty("controls_id", i+1);
                 sliderCreation->setValue(m_list_defaultOptions.at(i).second.toInt());
 
                 QSpinBox* spinBox = new QSpinBox(widget_slider_spin);
+
+#ifdef HG_CMP_MSC
+                widget_slider_spin->setMinimumWidth(200);
+                sliderCreation->setMinimumWidth(100);
+                spinBox->setMinimumWidth(75);
+#else
+                widget_slider_spin->setMinimumWidth(300);
+                sliderCreation->setMinimumWidth(120);
                 spinBox->setMinimumWidth(150);
+#endif
+
                 spinBox->setToolTip(opt->desc);
                 spinBox->setRange(opt->constraint.range->min, opt->constraint.range->max);
 
@@ -682,10 +695,8 @@ void hg_settingdialog::createUI()
         case SANE_TYPE_FIXED:
         {
             QWidget* widget_slider_spin = new QWidget(scrollArea);
-            widget_slider_spin->setMinimumWidth(300);
             QSlider* sliderCreation = new QSlider(widget_slider_spin);
             sliderCreation->setOrientation(Qt::Horizontal);
-            sliderCreation->setMinimumWidth(120);
             sliderCreation->setToolTip(opt->desc);
             int id = i + 1;
             sliderCreation->setProperty("controls_id", id);
@@ -693,7 +704,18 @@ void hg_settingdialog::createUI()
             sliderCreation->setValue(SANE_UNFIX(m_list_defaultOptions.at(i).second.toDouble()) * 100);
 
             QDoubleSpinBox* spinBox = new QDoubleSpinBox(widget_slider_spin);
+
+#ifdef HG_CMP_MSC
+            widget_slider_spin->setMinimumWidth(200);
+            sliderCreation->setMinimumWidth(100);
+            spinBox->setMinimumWidth(75);
+#else
+            widget_slider_spin->setMinimumWidth(300);
+            sliderCreation->setMinimumWidth(120);
             spinBox->setMinimumWidth(150);
+#endif
+
+
             spinBox->setToolTip(opt->desc);
             spinBox->setDecimals(2);
             spinBox->setSingleStep(0.01);