From 2620bf768309dd894cb198998f856814edfc9d5c Mon Sep 17 00:00:00 2001
From: DuanRay <ruizhe@nfschina.com>
Date: Tue, 17 Oct 2023 14:51:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?chore:=20=E4=BF=AE=E5=A4=8D=E5=9C=A8?=
 =?UTF-8?q?=E5=85=A8=E5=B1=8F=E6=A8=A1=E5=BC=8F=E4=B8=8B=EF=BC=8C=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84=E4=B8=BB=E8=8F=9C=E5=8D=95=E8=B6=85=E5=87=BA?=
 =?UTF-8?q?=E5=B1=8F=E5=B9=95=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 0007-show-main-menu-in-max-mode.patch | 35 +++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 0007-show-main-menu-in-max-mode.patch

diff --git a/0007-show-main-menu-in-max-mode.patch b/0007-show-main-menu-in-max-mode.patch
new file mode 100644
index 0000000..880e87d
--- /dev/null
+++ b/0007-show-main-menu-in-max-mode.patch
@@ -0,0 +1,35 @@
+diff --git a/nfs-mplayer-1.0.0/src/basegui.cpp b/nfs-mplayer-1.0.0/src/basegui.cpp
+index cc60b0d..99d578c 100755
+--- a/nfs-mplayer-1.0.0/src/basegui.cpp
++++ b/nfs-mplayer-1.0.0/src/basegui.cpp
+@@ -2669,7 +2669,7 @@ void BaseGui::createMainPanelShow() {
+     m_mainLogo->setFixedSize(168, 42);
+     m_mainLogo->setStyleSheet("QLabel {"
+                              "background:transparent;}");
+-
++    m_mainMenuPosXOffset = 30;
+     // 播放音频文件时logo
+     m_mainAudioLogo = new QLabel(panel);
+     m_mainAudioLogo->setPixmap(QPixmap("://images/main_audio_logo.png"));
+@@ -3317,7 +3317,7 @@ void BaseGui::mainMenu()
+     m_mainMenu->addAction(aboutThisAct);
+ 
+     QPoint point = mapToGlobal(m_menuBtn->pos());
+-    m_mainMenu->move(point.rx()-22, point.ry() + 30);
++    m_mainMenu->move(point.rx()-m_mainMenuPosXOffset, point.ry() + 30);
+     m_mainMenu->show();
+ }
+ 
+diff --git a/nfs-mplayer-1.0.0/src/basegui.h b/nfs-mplayer-1.0.0/src/basegui.h
+index 59d386d..7613660 100755
+--- a/nfs-mplayer-1.0.0/src/basegui.h
++++ b/nfs-mplayer-1.0.0/src/basegui.h
+@@ -1060,6 +1060,8 @@ private:
+ 
+ 	bool ignore_show_hide_events;
+     bool is_max_to_min;
++    
++    int m_mainMenuPosXOffset;
+ };
+ 
+ #endif
-- 
Gitee


From 9b6f40df9ab439fe646f2357b03889304344a320 Mon Sep 17 00:00:00 2001
From: DuanRay <ruizhe@nfschina.com>
Date: Wed, 18 Oct 2023 10:10:00 +0800
Subject: [PATCH 2/2] chore: update spec file

---
 nfs-mplayer.spec | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/nfs-mplayer.spec b/nfs-mplayer.spec
index b2538c8..5ceaf8f 100644
--- a/nfs-mplayer.spec
+++ b/nfs-mplayer.spec
@@ -1,10 +1,17 @@
 Name:           nfs-mplayer
 Version:        1.0.0
-Release:        1
+Release:        8%{?dist}
 Summary:        A great media player
 Group:          Applications/Multimedia
 License:        GPLv2+
 Source0:        %{name}-%{version}.tar.gz
+Patch0:	    0001-fix-show-desktop-background-before-start-play.patch
+Patch1:	    0002-resize-mini-mode-exeption.patch
+Patch2:	    0003-sometimes-cannot-loop-playback.patch
+Patch3:	    0004-transparent-bottom-control-bar-after-maximizing-the-window.patch
+Patch4:	    0005-set-stylesheet-to-affect-only-itself.patch
+Patch5:	    0006-fix-file-operation-will-pause-video-play.patch
+Patch6:	    0007-show-main-menu-in-max-mode.patch
 
 %if 0%{?suse_version}
 BuildRequires:  hicolor-icon-theme
@@ -104,3 +111,7 @@ update-desktop-database &> /dev/null || :
 /usr/bin/nfsmplayer_web_server
 
 %changelog
+
+* Wed Oct 18 2023 ruizhe <ruizhe@nfschina.com> - 1.0.0-8
+- Fix main menu display error in max mode.
+
-- 
Gitee