udpate changelog.

This commit is contained in:
Yue-Lan 2024-06-04 17:34:20 +08:00 committed by openkylin-cibot
parent 2d45669895
commit 3da304ee3b
3 changed files with 61 additions and 0 deletions

10
debian/changelog vendored
View File

@ -1,3 +1,13 @@
qt5-ukui-platformtheme (4.1.0.0-ok41) nile; urgency=medium
* 改动:
BUG号#I9Q0MJ、#I9Q9Y3
需求号:无
其他改动:无
影响域qqc1菜单高亮、qqc1按钮高亮
-- Yue Lan <lanyue@kylinos.cn> Tue, 04 Jun 2024 17:32:17 +0800
qt5-ukui-platformtheme (4.1.0.0-ok40) nile; urgency=medium
* 改动:

View File

@ -0,0 +1,50 @@
From: Yue-Lan <lanyue@kylinos.cn>
Date: Tue, 4 Jun 2024 17:34:20 +0800
Subject: udpate changelog.
---
libqt5-ukui-style/effects/highlight-effect.cpp | 6 ++++++
ukui-styles/qt5-config-style-ukui/ukui-config-style.cpp | 3 ++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/libqt5-ukui-style/effects/highlight-effect.cpp b/libqt5-ukui-style/effects/highlight-effect.cpp
index 44bd0fb..943a590 100644
--- a/libqt5-ukui-style/effects/highlight-effect.cpp
+++ b/libqt5-ukui-style/effects/highlight-effect.cpp
@@ -398,9 +398,15 @@ QPixmap HighLightEffect::bothOrdinaryAndHoverGeneratePixmap(const QPixmap &pixma
option->state.testFlag(QStyle::State_Sunken) ||
option->state.testFlag(QStyle::State_On) ||
option->state.testFlag(QStyle::State_Selected);
+
if (qobject_cast<const QAbstractItemView *>(widget)) {
if (!option->state.testFlag(QStyle::State_Selected))
overOrDown = false;
+ } else if (option->styleObject->inherits("QQuickStyleItem1")) {
+ // 修复qml菜单高亮状态异常问题
+ overOrDown = option->state.testFlag(QStyle::State_MouseOver) ||
+ option->state.testFlag(QStyle::State_Sunken) ||
+ option->state.testFlag(QStyle::State_Selected);
}
QPainter p(&target);
diff --git a/ukui-styles/qt5-config-style-ukui/ukui-config-style.cpp b/ukui-styles/qt5-config-style-ukui/ukui-config-style.cpp
index 7925d8f..63c8c06 100644
--- a/ukui-styles/qt5-config-style-ukui/ukui-config-style.cpp
+++ b/ukui-styles/qt5-config-style-ukui/ukui-config-style.cpp
@@ -4872,6 +4872,7 @@ void UKUIConfigStyle::drawControl(QStyle::ControlElement element, const QStyleOp
}
if (iconRect.isValid()) {
+ bool qqcButtonUseSymbolicIcon = option->styleObject && option->styleObject->inherits("QQuickStyleItem1") && button->icon.name().contains("symbolic");
if(sp->getAdjustColorRules() == UKUIConfigStyleParameters::AdjustColorRules::HSL &&
inactive && useTransparentButtonList().contains(qAppName()) && widget &&
widget->property("isWindowButton").isValid() &&
@@ -4881,7 +4882,7 @@ void UKUIConfigStyle::drawControl(QStyle::ControlElement element, const QStyleOp
color.setAlphaF(0.45);
drawColorPixmap(painter, color, pixmap);
}
- else if (widget && !widget->property("useIconHighlightEffect").isValid()) {
+ else if ((widget && !widget->property("useIconHighlightEffect").isValid()) || qqcButtonUseSymbolicIcon) {
if (!sp->m_PushButtonParameters.iconHoverClickHighlight) {
pixmap = HighLightEffect::ordinaryGeneratePixmap(pixmap, &sub, widget);
}

View File

@ -53,3 +53,4 @@
0053-Translated-using-Weblate-Uyghur.patch
0054-108.patch
0055-109.patch
0056-udpate-changelog.patch