!12 [sync] PR-10: 设置屏保字体为白色
From: @openeuler-sync-bot Reviewed-by: @tangjie02 Signed-off-by: @tangjie02
This commit is contained in:
commit
cc7cc7b90b
70
0001-fix-screensaver-set-screensaver-font-color-white.patch
Normal file
70
0001-fix-screensaver-set-screensaver-font-color-white.patch
Normal file
@ -0,0 +1,70 @@
|
||||
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: "Noto Sans CJK SC Light";
|
||||
font-size: 100px;
|
||||
+ color: #fefefe;
|
||||
}</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
@@ -66,6 +76,7 @@
|
||||
<string notr="true">QLabel{
|
||||
font-family: "Noto Sans CJK SC Light";
|
||||
font-size: 24px;
|
||||
+ color: #fefefe;
|
||||
}</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
--
|
||||
2.33.0
|
||||
|
||||
@ -1,12 +1,13 @@
|
||||
Name: kiran-screensaver
|
||||
Version: 2.2.1
|
||||
Release: 1
|
||||
Release: 2
|
||||
Summary: Kiran Desktop Screensaver Backend
|
||||
Summary(zh_CN): kiran桌面屏保后端
|
||||
|
||||
License: Mulan PSL v2
|
||||
License: MulanPSL-2.0
|
||||
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
Patch0001: 0001-fix-screensaver-set-screensaver-font-color-white.patch
|
||||
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: cmake
|
||||
@ -70,6 +71,9 @@ glib-compile-schemas /usr/share/glib-2.0/schemas &> /dev/nulls || :
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%changelog
|
||||
* Thu Aug 04 2022 liuxinhao <liuxinhao@kylinsec.com.cn> - 2.2.1-2
|
||||
- KYOS-B: set screensaver font color white(#I5H9OR)
|
||||
|
||||
* Mon Jul 25 2022 liuxinhao <liuxinhao@kylinsec.com.cn> - 2.2.1-1
|
||||
- KYOS-F: fix xscreensaver black screen
|
||||
- KYOS-F: Fixed high CPU utilization caused by floating label animation
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user