From 4c6dc080618c92be39228f4acbc273634d3d2fb5 Mon Sep 17 00:00:00 2001 From: zhaosai Date: Tue, 22 Oct 2024 14:32:53 +0800 Subject: [PATCH] sync patch from 1.22.1, fix kiran themes --- ...Remove-the-blue-border-when-the-mous.patch | 32 +++++++++ ...css-error-and-improve-style-of-kiran.patch | 69 +++++++++++++++++++ ...n-false-while-dbus-proxy-init-failed.patch | 30 ++++++++ mate-notification-daemon.spec | 8 ++- 4 files changed, 138 insertions(+), 1 deletion(-) create mode 100644 0011-fix-kiran-theme-Remove-the-blue-border-when-the-mous.patch create mode 100644 0012-fix-css-modify-css-error-and-improve-style-of-kiran.patch create mode 100644 0013-fix-daemon-return-false-while-dbus-proxy-init-failed.patch diff --git a/0011-fix-kiran-theme-Remove-the-blue-border-when-the-mous.patch b/0011-fix-kiran-theme-Remove-the-blue-border-when-the-mous.patch new file mode 100644 index 0000000..8394c2e --- /dev/null +++ b/0011-fix-kiran-theme-Remove-the-blue-border-when-the-mous.patch @@ -0,0 +1,32 @@ +From 30a876fadfd16b284fbff016c0dd6fe9ea576db7 Mon Sep 17 00:00:00 2001 +From: zhaosai +Date: Tue, 22 Oct 2024 14:29:48 +0800 +Subject: [PATCH] fix kiran theme Remove the blue border when the mouse enters + +--- + src/themes/kiran/kiran.c | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/src/themes/kiran/kiran.c b/src/themes/kiran/kiran.c +index 732cb2e..7f6b9b1 100644 +--- a/src/themes/kiran/kiran.c ++++ b/src/themes/kiran/kiran.c +@@ -321,15 +321,6 @@ paint_window_when_pointer_enter(GtkWidget *widget, + fill_background_when_pointer_enter(widget, windata, cr2); + cairo_fill(cr2); + +- rounded_rectangle(cr2, 0, 0, windata->width, windata->height, 8); +- cairo_set_source_rgba(cr2, +- 40 / 255.0, +- 144 / 255.0, +- 216 / 255.0, +- 1.0); +- cairo_set_line_width(cr2, 4.0); +- cairo_stroke(cr2); +- + cairo_destroy(cr2); + + cairo_save(cr); +-- +2.25.1 + diff --git a/0012-fix-css-modify-css-error-and-improve-style-of-kiran.patch b/0012-fix-css-modify-css-error-and-improve-style-of-kiran.patch new file mode 100644 index 0000000..1a3dd0f --- /dev/null +++ b/0012-fix-css-modify-css-error-and-improve-style-of-kiran.patch @@ -0,0 +1,69 @@ +From 0ee639d8b071696adab45454713e7e3d497f5e7d Mon Sep 17 00:00:00 2001 +From: yuanxing +Date: Wed, 1 Dec 2021 11:40:57 +0800 +Subject: [PATCH] fix(css):modify css error and improve style of kiran +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- 修改css文件的错误，完善kiran主题样式 + +Related #46120 +--- + src/themes/kiran/data/kiran.css | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +diff --git a/src/themes/kiran/data/kiran.css b/src/themes/kiran/data/kiran.css +index c1017d2..f733834 100644 +--- a/src/themes/kiran/data/kiran.css ++++ b/src/themes/kiran/data/kiran.css +@@ -12,7 +12,6 @@ + color: #919191; + font-size: 12px; + font-family: "Noto Sans CJK SC regular"; +- line-height：12px; + } + + #actions_label +@@ -32,11 +31,12 @@ + box-shadow:none; + margin:0px; + border: none; ++ border-radius: 0px; + } +- + #actions_button:hover + { + border-bottom:1px solid #3197DE; ++ background-color: transparent; + } + + #close_button +@@ -48,7 +48,7 @@ + padding: 0px; + border: none; + margin: 0px; +- box-shadow: 0px; ++ border-radius: 0px; + } + + #close_button:hover +@@ -70,13 +70,12 @@ + { + margin: 0px; + padding: 0px; +- box-shadow: 0px; + } + + #main_hbox + { +- margin-right: 14px; +- margin-bottom: 12px; ++ margin-right: 14px; ++ margin-bottom: 12px; + } + + #icon_box +-- +2.27.0 + diff --git a/0013-fix-daemon-return-false-while-dbus-proxy-init-failed.patch b/0013-fix-daemon-return-false-while-dbus-proxy-init-failed.patch new file mode 100644 index 0000000..c1116de --- /dev/null +++ b/0013-fix-daemon-return-false-while-dbus-proxy-init-failed.patch @@ -0,0 +1,30 @@ +From f31d22fe7b500f9cb1f2eeed474056e3f86514dd Mon Sep 17 00:00:00 2001 +From: XiaoWen +Date: Wed, 29 Jun 2022 16:42:19 +0800 +Subject: [PATCH] fix(daemon):return false while dbus proxy init failed +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- 当dbus接口初始化失败后返回错误 + +Signed-off-by: XiaoWen +--- + src/daemon/daemon.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/daemon/daemon.c b/src/daemon/daemon.c +index 44572e3..18bd02e 100644 +--- a/src/daemon/daemon.c ++++ b/src/daemon/daemon.c +@@ -1114,6 +1114,7 @@ static gboolean screensaver_active(GtkWidget* nw) + if (proxy == NULL) { + g_warning("Failed to get dbus connection: %s", error->message); + g_error_free (error); ++ return False; + } + + variant = g_dbus_proxy_call_sync (proxy, +-- +2.27.0 + diff --git a/mate-notification-daemon.spec b/mate-notification-daemon.spec index ba8f092..28b4422 100644 --- a/mate-notification-daemon.spec +++ b/mate-notification-daemon.spec @@ -14,7 +14,7 @@ Name: mate-notification-daemon Version: %{branch}.1 -Release: 5 +Release: 6 Summary: Notification daemon for MATE Desktop License: GPLv2+ URL: http://mate-desktop.org @@ -35,6 +35,9 @@ Patch0007: 0007-fix-themes-change-the-default-theme-to-kiran.patch Patch0008: 0008-fix-themes-change-the-first-option-to-kiran-in-mate.patch Patch0009: 0009-fix-theme-adjust-the-code-indent-and-remove-the-usel.patch Patch0010: 0010-fix-theme-change-the-indent-of-kiran.c-and-add-notes.patch +Patch0011: 0011-fix-kiran-theme-Remove-the-blue-border-when-the-mous.patch +Patch0012: 0012-fix-css-modify-css-error-and-improve-style-of-kiran.patch +Patch0013: 0013-fix-daemon-return-false-while-dbus-proxy-init-failed.patch BuildRequires: desktop-file-utils BuildRequires: gtk-layer-shell-devel @@ -106,6 +109,9 @@ rm -f %{buildroot}%{_datadir}/applications/mate-notification-daemon.desktop %changelog +* Tue Oct 22 2024 zhaosai - 1.26.1-6 +- sync patch from 1.22.1, fix kiran themes and improve kiran style + * Fri Oct 18 2024 zhaosai - 1.26.1-5 - sync patch from 1.22.1, fix kiran css themes -- Gitee