diff --git a/fix-toolbar-color.patch b/fix-toolbar-color.patch new file mode 100644 index 0000000..73ef03d --- /dev/null +++ b/fix-toolbar-color.patch @@ -0,0 +1,86 @@ +From 40133bb5a3a4240b9ea6f617fdf353e4f4507ffb Mon Sep 17 00:00:00 2001 +From: Guo Yunhe +Date: Tue, 11 Apr 2023 23:00:47 +0800 +Subject: [PATCH 1/3] fix toolbar text color in dark theme + +--- + rpcs3/rpcs3qt/stylesheets.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/rpcs3/rpcs3qt/stylesheets.h b/rpcs3/rpcs3qt/stylesheets.h +index 9121d03609c..89488a36e99 100644 +--- a/rpcs3/rpcs3qt/stylesheets.h ++++ b/rpcs3/rpcs3qt/stylesheets.h +@@ -17,7 +17,7 @@ namespace gui + "QSlider#sizeSlider::groove:horizontal { border-radius: .15em; background: #5b5b5b; height: .3em; }" + + // main window toolbar +- "QToolBar#mw_toolbar { background-color: #F0F0F0; border: none; }" ++ "QToolBar#mw_toolbar { color: #505050; background-color: #F0F0F0; border: none; }" + "QToolBar#mw_toolbar::separator { background-color: rgba(207, 207, 207, 235); width: 0.125em; margin-top: 0.250em; margin-bottom: 0.250em; }" + + // main window toolbar icon color + +From 564e4cfce0b32effcf104c07a243a6ef68177631 Mon Sep 17 00:00:00 2001 +From: Guo Yunhe +Date: Tue, 11 Apr 2023 23:34:15 +0800 +Subject: [PATCH 2/3] Update stylesheets.h + +--- + rpcs3/rpcs3qt/stylesheets.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/rpcs3/rpcs3qt/stylesheets.h b/rpcs3/rpcs3qt/stylesheets.h +index 89488a36e99..17a686acefa 100644 +--- a/rpcs3/rpcs3qt/stylesheets.h ++++ b/rpcs3/rpcs3qt/stylesheets.h +@@ -17,11 +17,11 @@ namespace gui + "QSlider#sizeSlider::groove:horizontal { border-radius: .15em; background: #5b5b5b; height: .3em; }" + + // main window toolbar +- "QToolBar#mw_toolbar { color: #505050; background-color: #F0F0F0; border: none; }" +- "QToolBar#mw_toolbar::separator { background-color: rgba(207, 207, 207, 235); width: 0.125em; margin-top: 0.250em; margin-bottom: 0.250em; }" ++ //"QToolBar#mw_toolbar { color: #505050; background-color: #F0F0F0; border: none; }" ++ //"QToolBar#mw_toolbar::separator { background-color: rgba(207, 207, 207, 235); width: 0.125em; margin-top: 0.250em; margin-bottom: 0.250em; }" + + // main window toolbar icon color +- "QLabel#toolbar_icon_color { color: #5b5b5b; }" ++ //"QLabel#toolbar_icon_color { color: #5b5b5b; }" + + // thumbnail icon color + "QLabel#thumbnail_icon_color { color: rgba(0, 100, 231, 255); }" + +From 5db33b57999d935b6d7d1ebd428237e89dfe12cb Mon Sep 17 00:00:00 2001 +From: Guo Yunhe +Date: Tue, 11 Apr 2023 23:43:03 +0800 +Subject: [PATCH 3/3] Update stylesheets.h + +--- + rpcs3/rpcs3qt/stylesheets.h | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/rpcs3/rpcs3qt/stylesheets.h b/rpcs3/rpcs3qt/stylesheets.h +index 17a686acefa..787981920e4 100644 +--- a/rpcs3/rpcs3qt/stylesheets.h ++++ b/rpcs3/rpcs3qt/stylesheets.h +@@ -9,15 +9,15 @@ namespace gui + const QString default_style_sheet + ( + // main window toolbar search +- "QLineEdit#mw_searchbar { padding: 0 1em; background: #fdfdfd; selection-background-color: #148aff; margin: .8em; color:#000000; }" ++ //"QLineEdit#mw_searchbar { padding: 0 1em; background: #fdfdfd; selection-background-color: #148aff; margin: .8em; color:#000000; }" + + // main window toolbar slider +- "QSlider#sizeSlider { color: #505050; background: #F0F0F0; }" +- "QSlider#sizeSlider::handle:horizontal { border: 0em smooth rgba(227, 227, 227, 255); border-radius: .58em; background: #404040; width: 1.2em; margin: -.5em 0; }" +- "QSlider#sizeSlider::groove:horizontal { border-radius: .15em; background: #5b5b5b; height: .3em; }" ++ //"QSlider#sizeSlider { color: #505050; background: #F0F0F0; }" ++ //"QSlider#sizeSlider::handle:horizontal { border: 0em smooth rgba(227, 227, 227, 255); border-radius: .58em; background: #404040; width: 1.2em; margin: -.5em 0; }" ++ //"QSlider#sizeSlider::groove:horizontal { border-radius: .15em; background: #5b5b5b; height: .3em; }" + + // main window toolbar +- //"QToolBar#mw_toolbar { color: #505050; background-color: #F0F0F0; border: none; }" ++ //"QToolBar#mw_toolbar { background-color: #F0F0F0; border: none; }" + //"QToolBar#mw_toolbar::separator { background-color: rgba(207, 207, 207, 235); width: 0.125em; margin-top: 0.250em; margin-bottom: 0.250em; }" + + // main window toolbar icon color diff --git a/rpcs3.changes b/rpcs3.changes index 644f535..b64bf3b 100644 --- a/rpcs3.changes +++ b/rpcs3.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 11 15:56:48 UTC 2023 - Yunhe Guo + +- Added fix-toolbar-color.patch + ------------------------------------------------------------------- Tue Apr 11 12:50:42 UTC 2023 - i@guoyunhe.me diff --git a/rpcs3.spec b/rpcs3.spec index 74102cd..18b638b 100644 --- a/rpcs3.spec +++ b/rpcs3.spec @@ -25,6 +25,7 @@ URL: https://rpcs3.net Source0: %{name}-%{version}.tar.xz Source1: intel-ittapi.tar.xz Patch1: fix-test-files.patch +Patch2: fix-toolbar-color.patch BuildRequires: gcc-c++ BuildRequires: llvm16-devel BuildRequires: cmake(x86-64) >= 3.14.1 @@ -94,6 +95,7 @@ An open-source PlayStation 3 emulator/debugger written in C++. %prep %setup -q -a 1 %patch1 -p 1 +%patch2 -p 1 #Generate Version Strings GIT_VERSION=$(echo %{version} | sed 's|.*git|git~|g')