From 09cfed8e6a63b2158322420c121a56a8f2340088 Mon Sep 17 00:00:00 2001 From: qiqi49 Date: Fri, 29 May 2026 18:31:05 +0800 Subject: [PATCH] =?UTF-8?q?feat(ukui-search-qml):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 调整高亮项透明度为固定值； 2. 删除默认界面测试按钮，清空按钮补充调用方法； 3. 优化二级页面分类菜单文字显示。 Task: #624919 From: kylin Severity: Low Change-Id: I0140e79c70f370de5511841f1ed5e489b1924368 --- .../org.ukui.search/ui/CategorySubPage.qml | 1 + .../src/org.ukui.search/ui/DefaultPage.qml | 21 +++++-------------- .../org.ukui.search/ui/ResultGroupHeader.qml | 1 + .../src/org.ukui.search/ui/ResultItem.qml | 1 + .../src/org.ukui.search/ui/ResultPage.qml | 2 ++ .../src/org.ukui.search/ui/SortMenuButton.qml | 6 +++++- 6 files changed, 15 insertions(+), 17 deletions(-) diff --git a/ukui-search-qml/src/org.ukui.search/ui/CategorySubPage.qml b/ukui-search-qml/src/org.ukui.search/ui/CategorySubPage.qml index 199c1e9e..f874d21d 100644 --- a/ukui-search-qml/src/org.ukui.search/ui/CategorySubPage.qml +++ b/ukui-search-qml/src/org.ukui.search/ui/CategorySubPage.qml @@ -92,6 +92,7 @@ Item { visible: subPageItem.resultsModel.availableSortOptions.length > 0 menuData: subPageItem.resultsModel menuType: "sort" + showContentText: !(widgetHost.previewVisible && subPageItem.isThumbnailActive) } } } diff --git a/ukui-search-qml/src/org.ukui.search/ui/DefaultPage.qml b/ukui-search-qml/src/org.ukui.search/ui/DefaultPage.qml index e370db61..eb819cc1 100644 --- a/ukui-search-qml/src/org.ukui.search/ui/DefaultPage.qml +++ b/ukui-search-qml/src/org.ukui.search/ui/DefaultPage.qml @@ -32,13 +32,12 @@ Column { property int resultColumnSpacing: 16 property real resultItemWidth: Math.floor((defaultPageItem.width - 16) / 2) - // Test: readonly property bool isHistoryPage: searchView.historyModel.count > 0 - property bool isHistoryPage: true + readonly property bool isHistoryPage: searchView.historyModel.count > 0 DtThemeBackground { width: defaultPageItem.width height: 1 - + useStyleTransparency: false backgroundColor: GlobalTheme.kDivider } @@ -56,17 +55,6 @@ Column { text: isHistoryPage ? qsTr("Search history") : qsTr("Recent files") } - // 测试按钮，后续注释掉 - Button { - width: 30 - height: 30 - anchors.centerIn: parent - icon.source: "start-here-symbolic" - onClicked: { - isHistoryPage = !isHistoryPage; - } - } - Icon { width: 16; height: width anchors.right: parent.right @@ -78,8 +66,9 @@ Column { MouseArea { anchors.fill: parent + enabled: isHistoryPage onClicked: { - // TODO: 清空搜索历史,最近打开功能先不实现 + searchView.clearHistory(); } } } @@ -107,7 +96,7 @@ Column { ResultItem { id: resultItem isSelected: false - icon: model.iconName + icon: model.iconName !== "" ? model.iconName : model.icon name: model.title dataSlot2: model.timestamp onClicked: { diff --git a/ukui-search-qml/src/org.ukui.search/ui/ResultGroupHeader.qml b/ukui-search-qml/src/org.ukui.search/ui/ResultGroupHeader.qml index f7dee13f..e43ccf28 100644 --- a/ukui-search-qml/src/org.ukui.search/ui/ResultGroupHeader.qml +++ b/ukui-search-qml/src/org.ukui.search/ui/ResultGroupHeader.qml @@ -41,6 +41,7 @@ Item { bottomMargin: 4 } radius: GlobalTheme.kRadiusNormal + useStyleTransparency: false backgroundColor: isSecondaryPage ? GlobalTheme.kContainGeneralAlphaNormal : GlobalTheme.kContainSecondaryAlphaNormal RowLayout { diff --git a/ukui-search-qml/src/org.ukui.search/ui/ResultItem.qml b/ukui-search-qml/src/org.ukui.search/ui/ResultItem.qml index e8627334..908b2445 100644 --- a/ukui-search-qml/src/org.ukui.search/ui/ResultItem.qml +++ b/ukui-search-qml/src/org.ukui.search/ui/ResultItem.qml @@ -42,6 +42,7 @@ MouseArea { DtThemeBackground { anchors.fill: parent + useStyleTransparency: false radius: GlobalTheme.kRadiusMenu backgroundColor: isSelected ? GlobalTheme.kBrandNormal : resultItem.containsPress ? GlobalTheme.kContainAlphaClick : resultItem.containsMouse ? GlobalTheme.kContainAlphaHover : GlobalTheme.kContainGeneralAlphaNormal diff --git a/ukui-search-qml/src/org.ukui.search/ui/ResultPage.qml b/ukui-search-qml/src/org.ukui.search/ui/ResultPage.qml index 778250e0..b215e3d4 100644 --- a/ukui-search-qml/src/org.ukui.search/ui/ResultPage.qml +++ b/ukui-search-qml/src/org.ukui.search/ui/ResultPage.qml @@ -113,6 +113,8 @@ Column { DtThemeBackground { radius: GlobalTheme.kRadiusNormal anchors.fill: parent + useStyleTransparency: false + backgroundColor: { if (titleDelegate.isSelected) { return titleDelegate.containsPress ? GlobalTheme.kBrandClick : titleDelegate.containsMouse ? GlobalTheme.kBrandHover : GlobalTheme.kBrandNormal; diff --git a/ukui-search-qml/src/org.ukui.search/ui/SortMenuButton.qml b/ukui-search-qml/src/org.ukui.search/ui/SortMenuButton.qml index 0f691f2f..641c1810 100644 --- a/ukui-search-qml/src/org.ukui.search/ui/SortMenuButton.qml +++ b/ukui-search-qml/src/org.ukui.search/ui/SortMenuButton.qml @@ -52,11 +52,14 @@ DtThemeBackground { property var currentOption: resolveCurrentOption() property string currentOptionText: currentOption && currentOption.text ? currentOption.text : currentKey property bool showLeadingIcon: leadingIconSource !== "" + property bool showContentText: true + property int horizontalPadding: 8 implicitWidth: contentRow.width + horizontalPadding * 2 implicitHeight: 30 height: implicitHeight - property int horizontalPadding: 8 + + useStyleTransparency: false radius: GlobalTheme.kRadiusNormal backgroundColor: sortMenu.visible ? GlobalTheme.kComponentAlphaHover : GlobalTheme.kContainSecondaryAlphaNormal visible: availableOptions.length > 0 @@ -214,6 +217,7 @@ DtThemeBackground { DtThemeText { id: currentText height: sortMenuButton.height + visible: showContentText verticalAlignment: Text.AlignVCenter text: currentOptionText } -- Gitee