From 5cac8cbbf04c9e198e4500ef9b391681388fe696 Mon Sep 17 00:00:00 2001
From: fanyuchen <fanyuchen@kylinos.cn>
Date: Tue, 23 Jul 2024 09:47:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=A0=87=E9=A2=98?=
 =?UTF-8?q?=E6=A0=8F=E5=AE=BD=E5=BA=A6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 debian/changelog         | 11 +++++++++++
 src/titlebar/titlebar.ui | 27 +++++++++++++++------------
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 596003f..4983a38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+kylin-scanner (3.2.1-ok2.14) nile; urgency=medium
+
+  * BUG号: 
+          #242503 【Intel ultra7】【扫描】窗口标题栏上下宽度异常，比其他应用的宽1倍
+  * 需求号:无
+  * 任务号: 无
+  * 其他改动说明: 无
+  * 其他改动影响域:无
+
+ -- fanyuchen <fanyuchen@kylinos.cn>  Tue, 23 Jul 2024 09:44:49 +0800
+
 kylin-scanner (3.2.1-ok2.13) nile; urgency=medium
 
   * BUG号: 
diff --git a/src/titlebar/titlebar.ui b/src/titlebar/titlebar.ui
index b092d7a..8f108c6 100644
--- a/src/titlebar/titlebar.ui
+++ b/src/titlebar/titlebar.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>960</width>
-    <height>64</height>
+    <height>40</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -19,7 +19,7 @@
   <property name="minimumSize">
    <size>
     <width>960</width>
-    <height>64</height>
+    <height>40</height>
    </size>
   </property>
   <property name="mouseTracking">
@@ -53,7 +53,7 @@
       <number>8</number>
      </property>
      <property name="topMargin">
-      <number>4</number>
+      <number>0</number>
      </property>
      <item>
       <widget class="QPushButton" name="m_logoBtn">
@@ -141,11 +141,14 @@
       <number>4</number>
      </property>
      <property name="topMargin">
-      <number>4</number>
+      <number>0</number>
      </property>
      <property name="rightMargin">
       <number>4</number>
      </property>
+     <property name="bottomMargin">
+      <number>0</number>
+     </property>
      <item>
       <widget class="QToolButton" name="m_OptionBtn">
        <property name="sizePolicy">
@@ -156,8 +159,8 @@
        </property>
        <property name="minimumSize">
         <size>
-         <width>48</width>
-         <height>48</height>
+         <width>32</width>
+         <height>32</height>
         </size>
        </property>
        <property name="maximumSize">
@@ -197,8 +200,8 @@
       <widget class="QPushButton" name="m_minBtn">
        <property name="minimumSize">
         <size>
-         <width>48</width>
-         <height>48</height>
+         <width>32</width>
+         <height>32</height>
         </size>
        </property>
        <property name="maximumSize">
@@ -238,8 +241,8 @@
       <widget class="QPushButton" name="m_maxBtn">
        <property name="minimumSize">
         <size>
-         <width>48</width>
-         <height>48</height>
+         <width>32</width>
+         <height>32</height>
         </size>
        </property>
        <property name="maximumSize">
@@ -285,8 +288,8 @@
       <widget class="QPushButton" name="m_closeBtn">
        <property name="minimumSize">
         <size>
-         <width>48</width>
-         <height>48</height>
+         <width>32</width>
+         <height>32</height>
         </size>
        </property>
        <property name="maximumSize">
-- 
Gitee