openkylin
/
ukui-menu
mirror of https://gitee.com/openkylin/ukui-menu.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

fix: 修复不跟随系统字体问题

This commit is contained in:
hewenfei 2023-11-03 15:09:42 +08:00 committed by openkylin-cibot
parent 8b4e785b89
commit 8f4b3f204c
3 changed files with 89 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
debian/changelog vendored
View File

@ -1,8 +1,9 @@
ukui-menu (4.0.0.9-ok0.1) yangtze; urgency=medium
ukui-menu (4.0.0.9-ok0.1build1) yangtze; urgency=medium
* issue: #I72IIJ
* rebuild: 4.0.0.9-ok0.1
-- hewenfei <hewenfei@kylinos.cn> Tue, 07 Nov 2023 16:43:13 +0800
-- hewenfei <hewenfei@kylinos.cn> Fri, 08 Mar 2024 09:56:46 +0800
ukui-menu (4.0.0.9-ok0) yangtze; urgency=medium

85
debian/patches/0001-fix.patch vendored Normal file
View File

@ -0,0 +1,85 @@
From: hewenfei <hewenfei@kylinos.cn>
Date: Fri, 3 Nov 2023 15:09:42 +0800
Subject: =?utf-8?b?Zml4OiDkv67lpI3kuI3ot5/pmo/ns7vnu5/lrZfkvZPpl67popg=?=
---
qml/AppControls2/StyleText.qml | 10 +++++-----
src/uiconfig/theme-palette.cpp | 8 ++++++++
src/uiconfig/theme-palette.h | 3 +++
3 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/qml/AppControls2/StyleText.qml b/qml/AppControls2/StyleText.qml
index de4b127..f549a81 100644
--- a/qml/AppControls2/StyleText.qml
+++ b/qml/AppControls2/StyleText.qml
@@ -11,18 +11,18 @@ Text {
function updateColor() {
color = themePalette.paletteColorWithCustomTransparency(paletteRole, Palette.Active, alpha);
}
- function updateFontSize() {
- systemFontSize = themePalette.systemFontSize();
+ function updateFont() {
+ font = themePalette.systemFont();
}
Component.onCompleted: {
updateColor();
- updateFontSize();
+ updateFont();
themePalette.styleColorChanged.connect(updateColor);
- themePalette.systemFontSizeChanged.connect(updateFontSize);
+ themePalette.systemFontChanged.connect(updateFont);
}
Component.onDestruction: {
themePalette.styleColorChanged.disconnect(updateColor);
- themePalette.systemFontSizeChanged.disconnect(updateFontSize);
+ themePalette.systemFontChanged.disconnect(updateFont);
}
onPaletteRoleChanged: {
updateColor();
diff --git a/src/uiconfig/theme-palette.cpp b/src/uiconfig/theme-palette.cpp
index e687364..257d947 100644
--- a/src/uiconfig/theme-palette.cpp
+++ b/src/uiconfig/theme-palette.cpp
@@ -42,6 +42,9 @@ ThemePalette::ThemePalette(QObject *parent) : QObject(parent)
connect(qGuiApp, &QGuiApplication::paletteChanged, this, [=] {
Q_EMIT styleColorChanged();
});
+ connect(qGuiApp, &QGuiApplication::fontChanged, this, [=] {
+ Q_EMIT systemFontChanged();
+ });
}
QColor ThemePalette::paletteColor(Palette::ColorRole colorRole, Palette::ColorGroup colorGroup) const
@@ -222,3 +225,8 @@ qreal ThemePalette::systemFontSize() const
{
return m_fontSize;
}
+
+QFont ThemePalette::systemFont()
+{
+ return QGuiApplication::font();
+}
diff --git a/src/uiconfig/theme-palette.h b/src/uiconfig/theme-palette.h
index 95272cb..54a4f13 100644
--- a/src/uiconfig/theme-palette.h
+++ b/src/uiconfig/theme-palette.h
@@ -23,6 +23,7 @@
#include <QObject>
#include <QPalette>
+#include <QFont>
#include "settings.h"
namespace UkuiMenu {
@@ -94,9 +95,11 @@ public:
Q_INVOKABLE QColor separator(Palette::ColorGroup colorGroup = Palette::Active) const;
Q_INVOKABLE qreal systemFontSize() const;
+ Q_INVOKABLE QFont systemFont();
Q_SIGNALS:
void styleColorChanged();
+ void systemFontChanged();
void systemFontSizeChanged();
private Q_SLOTS:

1
debian/patches/series vendored Normal file
View File

@ -0,0 +1 @@
0001-fix.patch