From 05526078ee58547f87539129f0b2bc5e8612ee66 Mon Sep 17 00:00:00 2001
From: maqi <maqi@uniontech.com>
Date: Mon, 13 May 2024 15:19:05 +0800
Subject: [PATCH] Solve the problem of not being able to shrink after
 magnification

---
 ...g-able-to-shrink-after-magnification.patch | 71 +++++++++++++++++++
 dde-launcher.spec                             |  8 ++-
 2 files changed, 77 insertions(+), 2 deletions(-)
 create mode 100644 0001-Solve-the-problem-of-not-being-able-to-shrink-after-magnification.patch

diff --git a/0001-Solve-the-problem-of-not-being-able-to-shrink-after-magnification.patch b/0001-Solve-the-problem-of-not-being-able-to-shrink-after-magnification.patch
new file mode 100644
index 0000000..07d9327
--- /dev/null
+++ b/0001-Solve-the-problem-of-not-being-able-to-shrink-after-magnification.patch
@@ -0,0 +1,71 @@
+From b81dafbd4fca202cfd65a51cfd38293c8d014ddc Mon Sep 17 00:00:00 2001
+From: maqi <maqi@uniontech.com>
+Date: Mon, 13 May 2024 15:09:33 +0800
+Subject: [PATCH] Solve the problem of not being able to shrink after
+ magnification
+
+---
+ src/windowedframe.cpp | 11 -----------
+ 1 file changed, 11 deletions(-)
+
+diff --git a/src/windowedframe.cpp b/src/windowedframe.cpp
+index 55c34069..bf997690 100644
+--- a/src/windowedframe.cpp
++++ b/src/windowedframe.cpp
+@@ -87,18 +87,14 @@ WindowedFrame::WindowedFrame(QWidget *parent)
+     , m_displayMode(All)
+     , m_calcUtil(CalculateUtil::instance())
+     , m_focusPos(Applist)
+-    , m_modeToggleBtn(new ModeToggleButton(this))
+     , m_searcherEdit(new DSearchEdit(this))
+     , m_enterSearchEdit(false)
+     , m_dockFrontInfc(new DBusDockInterface(this))
+ {
+-    if (!getDConfigValue("enableFullScreenMode", true).toBool())
+-        m_modeToggleBtn->hide();
+ 
+     m_searcherEdit->setAccessibleName("searcherEdit");
+     m_maskBg->setAccessibleName("MaskBg");
+     m_switchBtn->setAccessibleName("switchBtn");
+-    m_modeToggleBtn->setAccessibleName("modeToggleBtn");
+     m_tipsLabel->setAccessibleName("tipsLabel");
+ 
+     setMaskColor(DBlurEffectWidget::AutoColor);
+@@ -135,7 +131,6 @@ WindowedFrame::WindowedFrame(QWidget *parent)
+     searchLayout->setContentsMargins(9, 0, DLauncher::MINI_FRAME_LAYOUT_SPACE2, 0);
+     searchLayout->addWidget(m_searcherEdit);
+     searchLayout->setSpacing(6);
+-    searchLayout->addWidget(m_modeToggleBtn);
+ 
+     QHBoxLayout *appsLayout = new QHBoxLayout;
+     appsLayout->setContentsMargins(DLauncher::MINI_FRAME_LAYOUT_SPACE1, 0, 0, 0);
+@@ -225,7 +220,6 @@ WindowedFrame::WindowedFrame(QWidget *parent)
+     connect(m_delayHideTimer, &QTimer::timeout, this, &WindowedFrame::prepareHideLauncher, Qt::QueuedConnection);
+ 
+     connect(m_appearanceInter, &Appearance::OpacityChanged, this, &WindowedFrame::onOpacityChanged);
+-    connect(m_modeToggleBtn, &DToolButton::clicked, this, &WindowedFrame::onToggleFullScreen);
+ 
+     QTimer::singleShot(1, this, &WindowedFrame::onWMCompositeChanged);
+     onOpacityChanged(m_appearanceInter->opacity());
+@@ -235,10 +229,6 @@ WindowedFrame::WindowedFrame(QWidget *parent)
+     connect(this, &WindowedFrame::visibleChanged, this, &WindowedFrame::onHideMenu);
+ 
+     // 状态切换
+-    m_switchBtn->updateStatus(All);
+-    m_modeToggleBtn->setIconSize(QSize(32,32));
+-    m_modeToggleBtn->setFixedSize(40, 40);
+-    m_modeToggleBtn->setFocusPolicy(Qt::NoFocus);
+ 
+     // 重置控件样式
+     resetWidgetStyle();
+@@ -928,7 +918,6 @@ void WindowedFrame::onToggleFullScreen()
+     if (delegate)
+         delegate->setActived(false);
+ 
+-    m_modeToggleBtn->setHovered(false);
+ 
+     // 全屏状态标识
+     m_calcUtil->setFullScreen(true);
+-- 
+2.39.3
+
diff --git a/dde-launcher.spec b/dde-launcher.spec
index 7a5c1e0..b557886 100644
--- a/dde-launcher.spec
+++ b/dde-launcher.spec
@@ -2,7 +2,7 @@
 
 Name:           dde-launcher
 Version:        5.6.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        dde desktop-environment - Launcher module
 License:        GPLv3
 URL:            https://github.com/linuxdeepin/%{name}
@@ -26,6 +26,7 @@ BuildRequires:  dtkgui-devel
 BuildRequires:  dtkcommon-devel
 BuildRequires:  qt5-qttools-devel
 BuildRequires:  gmock-devel
+Patch:		0001-Solve-the-problem-of-not-being-able-to-shrink-after-magnification.patch
 %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
 Requires:       deepin-menu
 Requires:       dde-daemon
@@ -38,7 +39,7 @@ Requires:       libqtxdg
 
 
 %prep
-%autosetup
+%autosetup -p1
 sed -i 's|lrelease|lrelease-qt5|' translate_generation.sh
 
 %build
@@ -61,6 +62,9 @@ sed -i 's|lrelease|lrelease-qt5|' translate_generation.sh
 
 
 %changelog
+* Mon May 13 2024 maqi <maqi@uniontech.com> - 5.6.10-2
+- fix: Solve the problem of not being able to shrink after magnification 
+
 * Mon Oct 09 2023 liweigang <liweiganga@uniontech.com> - 5.6.10-1
 - update: update to version 5.6.10