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 0000000000000000000000000000000000000000..880e87dfab4d07b5ac9e2766082c3cbac0e39b62 --- /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 diff --git a/nfs-mplayer.spec b/nfs-mplayer.spec index b2538c82fde500f9679e7e10add84bb4c0a0ad96..5ceaf8f363560877442d73763c50785dbbd0780f 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 - 1.0.0-8 +- Fix main menu display error in max mode. +