diff --git a/example/qml/component/CodeExpander.qml b/example/qml/component/CodeExpander.qml index 50dfaa12..6d69d480 100644 --- a/example/qml/component/CodeExpander.qml +++ b/example/qml/component/CodeExpander.qml @@ -120,7 +120,8 @@ FluExpander{ "FluStatusView", "FluRatingControl", "FluPasswordBox", - "FluBreadcrumbBar" + "FluBreadcrumbBar", + "FluCopyableText" ]; code = code.replace(/\n/g, "
"); code = code.replace(/ /g, " "); diff --git a/example/qml/global/ItemsOriginal.qml b/example/qml/global/ItemsOriginal.qml index f5b52c23..499cc554 100644 --- a/example/qml/global/ItemsOriginal.qml +++ b/example/qml/global/ItemsOriginal.qml @@ -9,14 +9,14 @@ FluObject{ FluPaneItem{ title:lang.home - // icon:FluentIcons.Home - cusIcon: Image{ - anchors.centerIn: parent - source: FluTheme.dark ? "qrc:/example/res/svg/home_dark.svg" : "qrc:/example/res/svg/home.svg" - sourceSize: Qt.size(30,30) - width: 18 - height: 18 - } + icon:FluentIcons.Home + // cusIcon: Image{ + // anchors.centerIn: parent + // source: FluTheme.dark ? "qrc:/example/res/svg/home_dark.svg" : "qrc:/example/res/svg/home.svg" + // sourceSize: Qt.size(30,30) + // width: 18 + // height: 18 + // } onTap:{ navigationView.push("qrc:/example/qml/page/T_Home.qml") } @@ -34,6 +34,12 @@ FluObject{ navigationView.push("qrc:/example/qml/page/T_Buttons.qml") } } + FluPaneItem{ + title:"Text" + onTap:{ + navigationView.push("qrc:/example/qml/page/T_Text.qml") + } + } FluPaneItem{ title:"Slider" image:"qrc:/example/res/image/control/Slider.png" diff --git a/example/qml/page/T_TableView.qml b/example/qml/page/T_TableView.qml index 20b143ce..fa26c5da 100644 --- a/example/qml/page/T_TableView.qml +++ b/example/qml/page/T_TableView.qml @@ -71,7 +71,6 @@ FluScrollablePage{ leftPadding:6 rightPadding:6 onClicked:{ - console.debug(dataModel.index) showSuccess(JSON.stringify(dataObject)) } } diff --git a/example/qml/page/T_Text.qml b/example/qml/page/T_Text.qml new file mode 100644 index 00000000..51edce78 --- /dev/null +++ b/example/qml/page/T_Text.qml @@ -0,0 +1,36 @@ +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQuick.Window +import FluentUI +import "../component" + +FluScrollablePage{ + + title:"Text" + leftPadding:10 + rightPadding:10 + bottomPadding:20 + spacing: 0 + + FluArea{ + Layout.fillWidth: true + Layout.topMargin: 20 + height: 60 + paddings: 10 + + FluCopyableText{ + text: "这是一个可以支持复制的Text" + anchors.verticalCenter: parent.verticalCenter + } + + } + CodeExpander{ + Layout.fillWidth: true + Layout.topMargin: -1 + code:'FluCopyableText{ + text:"这是一个可以支持复制的Text" +}' + } + +} diff --git a/src/imports/FluentUI/Controls/FluNavigationView.qml b/src/imports/FluentUI/Controls/FluNavigationView.qml index f1f463d1..91f8e6d4 100644 --- a/src/imports/FluentUI/Controls/FluNavigationView.qml +++ b/src/imports/FluentUI/Controls/FluNavigationView.qml @@ -509,7 +509,7 @@ Item { onClicked: { d.enableNavigationPanel = !d.enableNavigationPanel } - visible: Layout.preferredWidth !== 0 + visible: d.isMinimal Behavior on Layout.preferredWidth{ NumberAnimation{ duration: 167