From 84a138b5f91ec1d3819565a52b4453677b652513 Mon Sep 17 00:00:00 2001 From: zhangkun Date: Wed, 10 Apr 2024 13:31:23 +0800 Subject: [PATCH] fix: The category title is too black Log: Set word weight to 500, size to T7, color to 60% transparency Issue: https://github.com/linuxdeepin/developer-center/issues/7786 --- launchercontroller.cpp | 4 ++-- launchercontroller.h | 2 +- qml/windowed/AppListView.qml | 3 ++- qml/windowed/FrequentlyUsedView.qml | 2 +- qml/windowed/RecentlyInstalledView.qml | 2 +- qml/windowed/SearchResultView.qml | 2 +- qml/windowed/WindowedFrame.qml | 2 +- 7 files changed, 9 insertions(+), 8 deletions(-) diff --git a/launchercontroller.cpp b/launchercontroller.cpp index db1c8735..6c86b976 100644 --- a/launchercontroller.cpp +++ b/launchercontroller.cpp @@ -151,9 +151,9 @@ bool LauncherController::shouldAvoidHideOrActive() return m_timer->isActive(); } -QFont LauncherController::boldFont(const QFont &f) +QFont LauncherController::boldFont(const QFont &f, QFont::Weight weight) { QFont font(f); - font.setWeight(QFont::Bold); + font.setWeight(weight); return font; } diff --git a/launchercontroller.h b/launchercontroller.h index b43ad683..566ac472 100644 --- a/launchercontroller.h +++ b/launchercontroller.h @@ -47,7 +47,7 @@ class LauncherController : public QObject Q_INVOKABLE void hideWithTimer(); Q_INVOKABLE bool shouldAvoidHideOrActive(); - Q_INVOKABLE QFont boldFont(const QFont& f); + Q_INVOKABLE QFont boldFont(const QFont& f, QFont::Weight weight); signals: void currentFrameChanged(); diff --git a/qml/windowed/AppListView.qml b/qml/windowed/AppListView.qml index 0dbc0b56..faa396c6 100644 --- a/qml/windowed/AppListView.qml +++ b/qml/windowed/AppListView.qml @@ -77,7 +77,8 @@ Item { QQC2.Label { anchors.verticalCenter: parent.verticalCenter text: headingBtn.text - font: LauncherController.boldFont(DTK.fontManager.t6) + font: LauncherController.boldFont(DTK.fontManager.t7, Font.Medium) + color: Qt.rgba(0, 0, 0, 0.6) } } } diff --git a/qml/windowed/FrequentlyUsedView.qml b/qml/windowed/FrequentlyUsedView.qml index c83f3b92..b8bce96f 100644 --- a/qml/windowed/FrequentlyUsedView.qml +++ b/qml/windowed/FrequentlyUsedView.qml @@ -30,7 +30,7 @@ Control { Label { text: qsTr("Frequently Used") - font: LauncherController.boldFont(DTK.fontManager.t6) + font: LauncherController.boldFont(DTK.fontManager.t6, Font.Bold) } GridViewContainer { diff --git a/qml/windowed/RecentlyInstalledView.qml b/qml/windowed/RecentlyInstalledView.qml index d059f150..31e06c14 100644 --- a/qml/windowed/RecentlyInstalledView.qml +++ b/qml/windowed/RecentlyInstalledView.qml @@ -25,7 +25,7 @@ Control { spacing: 0 Label { text: qsTr("Recently Installed") - font: LauncherController.boldFont(DTK.fontManager.t6) + font: LauncherController.boldFont(DTK.fontManager.t6, Font.Bold) } GridViewContainer { diff --git a/qml/windowed/SearchResultView.qml b/qml/windowed/SearchResultView.qml index 1113bf56..7af34f45 100644 --- a/qml/windowed/SearchResultView.qml +++ b/qml/windowed/SearchResultView.qml @@ -28,7 +28,7 @@ Control { Label { text: qsTr("All Apps") - font: LauncherController.boldFont(DTK.fontManager.t6) + font: LauncherController.boldFont(DTK.fontManager.t6, Font.Bold) } GridViewContainer { diff --git a/qml/windowed/WindowedFrame.qml b/qml/windowed/WindowedFrame.qml index ccdd9399..79b70640 100644 --- a/qml/windowed/WindowedFrame.qml +++ b/qml/windowed/WindowedFrame.qml @@ -133,7 +133,7 @@ Item { backgroundAlpha: 0.8 width: 370 height: 312 - folderNameFont: LauncherController.boldFont(DTK.fontManager.t6) + folderNameFont: LauncherController.boldFont(DTK.fontManager.t6, Font.Bold) onVisibleChanged: function (visible) { if (!visible) {