!22 [sync] PR-21: fix mate-terminal theme

From: @openeuler-sync-bot 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang
This commit is contained in:
openeuler-ci-bot 2023-03-10 07:19:11 +00:00 committed by Gitee
commit f3e73144ef
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 48 additions and 1 deletions

View File

@ -0,0 +1,43 @@
From b1400c71a92d0893103d3a1a616976fac0787117 Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Thu, 9 Mar 2023 14:10:33 +0800
Subject: [PATCH] fix mate-terminal theme
---
decorations/decorationbridge.cpp | 19 +++++++++++++++++++
1 files changed, 19 insertions(+)
diff --git a/decorations/decorationbridge.cpp b/decorations/decorationbridge.cpp
index 10e766c..a19fe8a 100644
--- a/decorations/decorationbridge.cpp
+++ b/decorations/decorationbridge.cpp
@@ -156,7 +156,26 @@ void DecorationBridge::init()
m_dpi = 30; //设置一个限度不允许dpi小于30
}
}
+ QGSettings* pThemeSettings = new QGSettings("org.ukui.style", "/org/ukui/style/", this);
+ QString strTheme;
+ if (true == pThemeSettings->keys().contains("styleName")){
+ strTheme = pThemeSettings->get("style-name").toString();
+ qDebug() << "DecorationBridge::init theme:" << strTheme;
+ }
+
+ if("ukui-light" == strTheme)
+ {
+ m_themeId = 0;
+ }
+ else if("ukui-dark" == strTheme)
+ {
+ m_themeId = 1;
+ }
+ else //默认ukui-default
+ {
+ m_themeId = 0;
+ }
const QFont font = QFontDatabase::systemFont(QFontDatabase::TitleFont);
m_nFont = font.pointSize();
--
2.39.1

View File

@ -1,12 +1,13 @@
Name: ukui-kwin
Version: 1.0.5
Release: 3
Release: 4
Summary: KDE Window Manager for UKUI desktop environment
License: GPL-2.0-or-later and LGPL-2.0-or-later
URL: https://github.com/ukui/ukui-kwin
Source0: ukui-kwin-1.0.5.tar.gz
Patch01: 0001-fix-ukui-kwin-data-install-error.patch
Patch02: 0002-fix-mate-terminal-theme.patch
BuildRequires: cmake extra-cmake-modules
BuildRequires: kf5-kinit-devel kscreenlocker-devel libcap-devel libdrm-devel >= 2.4.62 mesa-libEGL-devel libepoxy-devel >= 1.2 fontconfig-devel freetype-devel libgbm-devel libICE-devel libinput-devel >= 1.15.5 kdecoration-devel
@ -202,6 +203,9 @@ cp COPYING* %{buildroot}%{_datadir}/licenses/ukui-kwin/
%changelog
* Thu Mar 09 2023 peijiankang<peijiankang@kylinos.cn> - 1.0.5-4
- fix mate-terminal theme
* Thu Feb 16 2023 peijiankang<peijiankang@kylinos.cn> - 1.0.5-3
- fix ukui-kwin-data install error