From 33a4a7d96194cb5234a1906fae7f5740bf747038 Mon Sep 17 00:00:00 2001 From: gjq Date: Thu, 9 Feb 2023 16:07:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=8F=92=E4=BB=B6=E7=95=8C?= =?UTF-8?q?=E9=9D=A2ui=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- qml/AppUI/NormalUI.qml | 8 +++++++- qml/AppUI/Sidebar.qml | 30 +++++++++++++++++++++++++----- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/qml/AppUI/NormalUI.qml b/qml/AppUI/NormalUI.qml index 85b58ae..18f6e86 100644 --- a/qml/AppUI/NormalUI.qml +++ b/qml/AppUI/NormalUI.qml @@ -1,7 +1,13 @@ import QtQuick 2.12 import QtQuick.Controls 2.0 as QQC2 +import AppControls2 1.0 as AppControls2 +import org.ukui.menu.core 1.0 -Item { +AppControls2.StyleBackground { + paletteRole: Palette.Window + radius: 12 + useStyleTransparent: false + alpha: 0.75 Row { anchors.fill: parent; diff --git a/qml/AppUI/Sidebar.qml b/qml/AppUI/Sidebar.qml index 7443747..a9145dd 100644 --- a/qml/AppUI/Sidebar.qml +++ b/qml/AppUI/Sidebar.qml @@ -4,14 +4,17 @@ import QtQuick.Layouts 1.12 Item { ColumnLayout { anchors.fill: parent - Item { + anchors.topMargin: 12 + + Row { Layout.fillWidth: true - Layout.preferredHeight: 30 + Layout.preferredHeight: 40 + Layout.rightMargin: 12 ListView { id: extensionListView - anchors.fill: parent - + width: parent.width - 34 + height: parent.height orientation: ListView.Horizontal model: extensionManager.extensionModel() delegate: headerDelegate @@ -28,8 +31,12 @@ Item { } } } - } + Item { + width: 34 + height: 34 + } + } Item { Layout.fillWidth: true Layout.fillHeight: true @@ -44,10 +51,23 @@ Item { } } } + + Row { + Layout.fillWidth: true + Layout.preferredHeight: 40 + Layout.rightMargin: 12 + layoutDirection: Qt.RightToLeft + + Item { + width: 32 + height: 32 + } + } } Component { id: headerDelegate + Item { property var extensionData: model.data width: 100