修复以下问题:

修复kiran-screensaver dbus service文件中组名大小写错误的问题
        修复当Xorg没加载xrandr插件时,淡出功能引发的崩溃
        修复QStringLiteral头文件包含问题
        使用另外一个高斯模糊接口,避免崩溃以及错误释放导致的死锁
        修复由于锁定屏幕插入拔出时对于窗口管理错误的释放导致的崩溃SIGABRT/SIGABRT
This commit is contained in:
liuxinhao 2022-12-05 17:12:30 +08:00
parent fa6e747fe2
commit 38070a9ae2
4 changed files with 9 additions and 73 deletions

View File

@ -1,70 +0,0 @@
From f2ca3ffb5d406adb7fc40f7bc4d75807f0f732b5 Mon Sep 17 00:00:00 2001
From: liuxinhao <liuxinhao@kylinsec.com.cn>
Date: Wed, 3 Aug 2022 22:33:13 +0800
Subject: [PATCH] fix(screensaver): set screensaver font color white
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 设置屏保字体颜色为白色
Closes #I5H9OR
---
src/screensaver/float-label.cpp | 2 +-
src/screensaver/screensaver.ui | 13 ++++++++++++-
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/screensaver/float-label.cpp b/src/screensaver/float-label.cpp
index 23729c3..224761e 100644
--- a/src/screensaver/float-label.cpp
+++ b/src/screensaver/float-label.cpp
@@ -30,7 +30,7 @@ FloatLabel::FloatLabel(QWidget *parent)
layout->addWidget(m_labelPixmap,Qt::AlignHCenter);
m_labelText = new QLabel(this);
- m_labelText->setStyleSheet("QLabel{font-family:Noto Sans CJK SC Light; font-size:14px;}");
+ m_labelText->setStyleSheet("QLabel{font-family:Noto Sans CJK SC Light; font-size:14px;color:#fefefe;}");
m_labelText->setAlignment(Qt::AlignCenter);
layout->addWidget(m_labelText,Qt::AlignHCenter);
diff --git a/src/screensaver/screensaver.ui b/src/screensaver/screensaver.ui
index b03d424..d4c79e4 100644
--- a/src/screensaver/screensaver.ui
+++ b/src/screensaver/screensaver.ui
@@ -17,7 +17,16 @@
<property name="spacing">
<number>0</number>
</property>
- <property name="margin">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
<number>0</number>
</property>
<item>
@@ -50,6 +59,7 @@
<string notr="true">QLabel{
font-family: &quot;Noto Sans CJK SC Light&quot;;
font-size: 100px;
+ color: #fefefe;
}</string>
</property>
<property name="text">
@@ -66,6 +76,7 @@
<string notr="true">QLabel{
font-family: &quot;Noto Sans CJK SC Light&quot;;
font-size: 24px;
+ color: #fefefe;
}</string>
</property>
<property name="text">
--
2.33.0

Binary file not shown.

Binary file not shown.

View File

@ -1,13 +1,12 @@
Name: kiran-screensaver
Version: 2.2.1
Release: 3
Version: 2.2.2
Release: 1
Summary: Kiran Desktop Screensaver Backend
Summary(zh_CN): kiran桌面屏保后端
License: MulanPSL-2.0
Source0: %{name}-%{version}.tar.gz
Patch0001: 0001-fix-screensaver-set-screensaver-font-color-white.patch
BuildRequires: gcc-c++
BuildRequires: cmake
@ -71,6 +70,13 @@ glib-compile-schemas /usr/share/glib-2.0/schemas &> /dev/nulls || :
rm -rf %{buildroot}
%changelog
* Mon Dec 05 2022 liuxinhao <liuxinhao@kylinsec.com.cn> - 2.2.2-1
- KYOS-F: Fix the crash caused by window management when the lock screen is inserted and pulled out
- KYOS-F: Use another Gaussian blur interface to avoid the deadlock caused by crash and error release
- KYOS-F: Fix header file contains problems
- KYOS-F: Fix the crash caused by fade out function when Xorg does not load the xrandr plug-in
- KYOS-F: Fix the problem of incorrect case of group name in kiran screensaver dbus service file
* Mon Aug 08 2022 luoqing <luoqing@kylinsec.com.cn> - 2.2.1-3
- KYOS-F: Modify license.