From 941aff4890b9c4bcbc08b963f68b09294faf3082 Mon Sep 17 00:00:00 2001 From: youdiansaodongxi Date: Thu, 11 Jul 2024 15:17:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(qml/AppUI):=20=E4=BF=AE=E6=94=B9issue?= =?UTF-8?q?=20I9SG56:=20=E9=83=A8=E5=88=86=E4=BD=8D=E7=BD=AE=E6=82=AC?= =?UTF-8?q?=E6=B5=AE=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=BC=A9=E7=95=A5=E5=86=85?= =?UTF-8?q?=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- qml/AppUI/AppLabelPage.qml | 11 +++++++++++ qml/AppUI/FullScreenAppItem.qml | 7 +++++++ 2 files changed, 18 insertions(+) diff --git a/qml/AppUI/AppLabelPage.qml b/qml/AppUI/AppLabelPage.qml index 0be89a5..d6e0297 100644 --- a/qml/AppUI/AppLabelPage.qml +++ b/qml/AppUI/AppLabelPage.qml @@ -43,6 +43,13 @@ GridView { focus: true hoverEnabled: true + UkuiItems.Tooltip { + anchors.fill: parent + mainText: modelData.label + posFollowCursor: true + active: labelArea.showTooltip + } + onClicked: { GridView.view.labelSelected(modelData.label); GridView.view.currentIndex = model.index @@ -55,6 +62,9 @@ GridView { } UkuiItems.StyleBackground { + id: labelArea + property bool showTooltip: labelText.visible ? labelText.truncated : false + anchors.fill: parent radius: Platform.Theme.normalRadius @@ -66,6 +76,7 @@ GridView { borderColor: Platform.Theme.Highlight UkuiItems.StyleText { + id: labelText anchors.fill: parent visible: modelData.type === LabelItem.Text text: modelData.display diff --git a/qml/AppUI/FullScreenAppItem.qml b/qml/AppUI/FullScreenAppItem.qml index 4aa1b71..6c35bd8 100644 --- a/qml/AppUI/FullScreenAppItem.qml +++ b/qml/AppUI/FullScreenAppItem.qml @@ -33,6 +33,13 @@ MouseArea { hoverEnabled: true + UkuiItems.Tooltip { + anchors.fill: parent + mainText: text.text + posFollowCursor: true + active: text.truncated + } + UkuiItems.StyleBackground { id: styleBackground anchors.fill: parent -- Gitee From 03bd099b6fbfcb412590395a63bb30086d5b8f80 Mon Sep 17 00:00:00 2001 From: youdiansaodongxi Date: Wed, 17 Jul 2024 14:18:11 +0800 Subject: [PATCH 2/2] update changelog for: 4.10.2.7-ok0 --- debian/changelog | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3930ce9..40b29a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +ukui-menu (4.10.2.7-ok0) nile; urgency=medium + + * Issue: + - I9SG56: 部分位置悬浮不现实缩略内容 + * 其他改动:无 + * 其他改动影响域:无 + + -- youdiansaodongxi Wed, 17 Jul 2024 14:14:29 +0800 + ukui-menu (4.10.2.6-ok1) nile; urgency=medium * Issue:无 -- Gitee