diff --git a/qml/Main.qml b/qml/Main.qml index 2c80d23..c256c3b 100644 --- a/qml/Main.qml +++ b/qml/Main.qml @@ -153,6 +153,7 @@ QtObject { StyledBehindWindowBlur { control: parent anchors.fill: parent + blendColor: Qt.rgba(0, 0, 0, 0.5) } InsideBoxBorder { anchors.fill: parent diff --git a/qml/WindowedFrame.qml b/qml/WindowedFrame.qml index 8a174f9..85276d9 100644 --- a/qml/WindowedFrame.qml +++ b/qml/WindowedFrame.qml @@ -29,6 +29,7 @@ StackView { spacing: 10 + // 左侧应用列表 采用垂直排列 ColumnLayout { Layout.fillWidth: false Layout.preferredWidth: 220 @@ -45,7 +46,6 @@ StackView { icon.name: iconName width: appListView.width font: DTK.fontManager.t8 - // icon.source: "image://app-icon/" + iconName; ColorSelector.family: Palette.CrystalColor TapHandler { @@ -88,12 +88,13 @@ StackView { } } + //底部关机按键和设置按键 RowLayout { Layout.fillWidth: true Layout.fillHeight: false Layout.preferredHeight: 30 Layout.topMargin: 5 - spacing: 10 + spacing: 1 ToolButton { icon.name: "shutdown" @@ -115,11 +116,26 @@ StackView { } } - Item { + //搜索按钮 + SearchEdit { + id: searchEdit + + Layout.leftMargin: 2 + Layout.rightMargin: 0 + Layout.preferredHeight: 25 Layout.fillWidth: true + clearButton.height : 5 + clearButton.width : 5 + placeholder: qsTr("Search") + onTextChanged: { + console.log(text) + SearchFilterProxyModel.setFilterRegularExpression(text) + } } + //隐藏切换按钮 ButtonBox { + visible:false Layout.preferredHeight: 30 padding: 0 ColorSelector.family: Palette.CrystalColor @@ -141,6 +157,7 @@ StackView { } } + //右侧网格列表 垂直排列 ColumnLayout { Layout.fillWidth: true Layout.fillHeight: true @@ -185,12 +202,13 @@ StackView { vScrollBar: ScrollBar {} } - Layout.preferredHeight: rowCount === 0 ? 50 : rowCount * favoriteGridViewContainer.cellSize + Layout.fillHeight: true Layout.fillWidth: true } Label { text: qsTr("All Apps") + visible : !favoriteGridView.visible font: LauncherController.boldFont(DTK.fontManager.t6) } @@ -214,6 +232,7 @@ StackView { id: allAppsGridContainer rows: 0 columns: 4 + visible : !favoriteGridView.visible placeholderIcon: "search_no_result" placeholderText: qsTr("No search results") model: delegateAllAppsModel @@ -246,18 +265,8 @@ StackView { contentItem: RowLayout { Layout.fillHeight: false - SearchEdit { - id: searchEdit - - Layout.leftMargin: width / 5 - Layout.rightMargin: width / 5 - + Item { Layout.fillWidth: true - placeholder: qsTr("Search") - onTextChanged: { - console.log(text) - SearchFilterProxyModel.setFilterRegularExpression(text) - } } ToolButton {