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 199c1e9ee37e5c841dd78bab90d4b39dd2709c9c..f874d21d6e5caeac2d4bcf9c771825875e88a609 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 e370db612918f18d46755b10fa44bf4b63f3ed58..eb819cc1d5035c08382f5da1b61b8acf65493218 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 f7dee13fba81a6f489b87ddecb4d73ad085fc518..e43ccf28233ad57829f7e45aa489efb936453640 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 e86273346bef631ac2169b42a9100ea685e7b73f..908b2445c89d91750b91af398e2574034ce8d2fa 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 778250e0f0bac44214841fdf5924a5e06c59bdc7..b215e3d4bcfd5f1478ecb034f014bd3158125fbe 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 0f691f2ff04761637ef0bf983201b58944f6efe7..641c1810a1ef12e5ae0b0cbc03da0e92cfdb7abe 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 }