From db41a7a1ee72980c7ad1adcb4dfd24382647d3c3 Mon Sep 17 00:00:00 2001 From: zhuzihcu Date: Fri, 19 May 2023 18:13:57 +0800 Subject: [PATCH] update --- example/qml/component/CustomWindow.qml | 4 ---- example/qml/page/T_Settings.qml | 1 - src/imports/FluentUI/Controls/FluNavigationView.qml | 6 +++--- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/example/qml/component/CustomWindow.qml b/example/qml/component/CustomWindow.qml index ef0b3bbe..8eb2114c 100644 --- a/example/qml/component/CustomWindow.qml +++ b/example/qml/component/CustomWindow.qml @@ -12,10 +12,6 @@ FluWindow { property bool appBarVisible: true default property alias content: container.data - Component.onCompleted: { - console.debug(FramelessUtils.frameBorderVisible) - } - FluAppBar { id: title_bar title: window.title diff --git a/example/qml/page/T_Settings.qml b/example/qml/page/T_Settings.qml index 19cb660a..2207e5f2 100644 --- a/example/qml/page/T_Settings.qml +++ b/example/qml/page/T_Settings.qml @@ -101,7 +101,6 @@ FluScrollablePage{ selected : appInfo.lang.objectName === modelData text:modelData onClicked:{ - console.debug(modelData) appInfo.changeLang(modelData) } } diff --git a/src/imports/FluentUI/Controls/FluNavigationView.qml b/src/imports/FluentUI/Controls/FluNavigationView.qml index d42cb7e2..a1185731 100644 --- a/src/imports/FluentUI/Controls/FluNavigationView.qml +++ b/src/imports/FluentUI/Controls/FluNavigationView.qml @@ -16,6 +16,7 @@ Item { property string title: "" property FluObject items property FluObject footerItems + property bool dontPageAnimation: false property int displayMode: FluNavigationView.Auto property Component autoSuggestBox property Component actionItem @@ -482,7 +483,6 @@ Item { if(item.idx<(nav_list.count - layout_footer.count)){ layout_footer.currentIndex = -1 }else{ - console.debug(item.idx-(nav_list.count-layout_footer.count)) layout_footer.currentIndex = item.idx-(nav_list.count-layout_footer.count) } nav_list.currentIndex = item.idx @@ -563,7 +563,7 @@ Item { properties: "y" from: 0 to: nav_swipe.height - duration: 167 + duration: dontPageAnimation ? 0 : 167 easing.type: Easing.BezierSpline easing.bezierCurve: [ 1, 0, 0, 0 ] } @@ -573,7 +573,7 @@ Item { properties: "y"; from: nav_swipe.height; to: 0 - duration: 167 + duration: dontPageAnimation ? 0 : 167 easing.type: Easing.BezierSpline easing.bezierCurve: [ 0, 0, 0, 1 ] }