From 78815224fe43aa999004b620f56bec0230ab2a51 Mon Sep 17 00:00:00 2001 From: zhuzichu Date: Tue, 11 Jul 2023 10:46:57 +0800 Subject: [PATCH] update --- example/CMakeLists.txt | 2 +- example/qml/page/T_Awesome.qml | 1 + example/qml/page/T_Expander.qml | 1 - example/qml/window/MainWindow.qml | 4 ++++ example/src/main.cpp | 1 - src/CMakeLists.txt | 3 +-- src/imports/FluentUI/Controls/FluNavigationView.qml | 1 - src/imports/FluentUI/Controls/FluScrollablePage.qml | 1 - src/imports/FluentUI/Controls/FluTableView.qml | 1 - src/imports/FluentUI/Controls/FluTreeView.qml | 1 - 10 files changed, 7 insertions(+), 9 deletions(-) diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index 46f6b365..64d22c85 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -24,7 +24,7 @@ endif() file(TO_CMAKE_PATH "/" PATH_SEPARATOR) #设置版本号 -add_definitions(-DVERSION=1,3,7,3) +add_definitions(-DVERSION=1,3,7,4) find_package(Qt6 REQUIRED COMPONENTS Quick) diff --git a/example/qml/page/T_Awesome.qml b/example/qml/page/T_Awesome.qml index e607af36..182ce910 100644 --- a/example/qml/page/T_Awesome.qml +++ b/example/qml/page/T_Awesome.qml @@ -33,6 +33,7 @@ FluContentPage { cellWidth: 80 cellHeight: 80 clip: true + boundsBehavior: GridView.StopAtBounds model:FluApp.awesomelist() ScrollBar.vertical: FluScrollBar {} anchors{ diff --git a/example/qml/page/T_Expander.qml b/example/qml/page/T_Expander.qml index 36d89512..36f390e3 100644 --- a/example/qml/page/T_Expander.qml +++ b/example/qml/page/T_Expander.qml @@ -58,7 +58,6 @@ FluScrollablePage{ width: parent.width height: parent.height contentWidth: width - maximumFlickVelocity: 1680 contentHeight: text_info.height ScrollBar.vertical: FluScrollBar {} FluText{ diff --git a/example/qml/window/MainWindow.qml b/example/qml/window/MainWindow.qml index 3929fb06..2e7fa7e5 100644 --- a/example/qml/window/MainWindow.qml +++ b/example/qml/window/MainWindow.qml @@ -25,6 +25,10 @@ CustomWindow { event.accepted = false } + Component.onCompleted: { + FluTools.setQuitOnLastWindowClosed(false) + } + Connections{ target: appInfo function onActiveWindow(){ diff --git a/example/src/main.cpp b/example/src/main.cpp index 8c4a09b7..2ac8c945 100644 --- a/example/src/main.cpp +++ b/example/src/main.cpp @@ -35,7 +35,6 @@ int main(int argc, char *argv[]) if(!appInfo->isOwnerProcess(&ipc)){ return 0; } - app.setQuitOnLastWindowClosed(false); QQmlApplicationEngine engine; FramelessHelper::Quick::registerTypes(&engine); #ifdef FLUENTUI_BUILD_STATIC_LIB diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index cc9fe329..e8f17cf9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -15,7 +15,7 @@ endif() set(QML_PLUGIN_DIRECTORY ${CMAKE_PREFIX_PATH}/qml/FluentUI) #设置版本号 -add_definitions(-DVERSION=1,3,7,3) +add_definitions(-DVERSION=1,3,7,4) find_package(Qt6 REQUIRED COMPONENTS Core Quick Qml) @@ -67,7 +67,6 @@ if (FLUENTUI_BUILD_STATIC_LIB) OUTPUT_DIRECTORY ${QML_PLUGIN_DIRECTORY} VERSION 1.0 URI "FluentUI" - #修改qmltypes文件名称。默认fluentuiplugin.qmltypes，使用默认名称有时候import FluentUI会爆红，所以修改成plugins.qmltypes TYPEINFO "plugins.qmltypes" SOURCES ${sources_files} fluentui.rc QML_FILES ${qml_files} diff --git a/src/imports/FluentUI/Controls/FluNavigationView.qml b/src/imports/FluentUI/Controls/FluNavigationView.qml index c651ad1f..57cc1e17 100644 --- a/src/imports/FluentUI/Controls/FluNavigationView.qml +++ b/src/imports/FluentUI/Controls/FluNavigationView.qml @@ -785,7 +785,6 @@ Item { } boundsBehavior: ListView.StopAtBounds clip: true - maximumFlickVelocity: 1680 contentHeight: nav_list.contentHeight ScrollBar.vertical: FluScrollBar {} ListView{ diff --git a/src/imports/FluentUI/Controls/FluScrollablePage.qml b/src/imports/FluentUI/Controls/FluScrollablePage.qml index 8a4bbd8c..34fa0c00 100644 --- a/src/imports/FluentUI/Controls/FluScrollablePage.qml +++ b/src/imports/FluentUI/Controls/FluScrollablePage.qml @@ -38,7 +38,6 @@ FluPage { bottom: parent.bottom bottomMargin: control.bottomPadding } - maximumFlickVelocity: 1680 contentWidth: parent.width contentHeight: container.height ScrollBar.vertical: FluScrollBar { diff --git a/src/imports/FluentUI/Controls/FluTableView.qml b/src/imports/FluentUI/Controls/FluTableView.qml index f094a9b6..b40f735a 100644 --- a/src/imports/FluentUI/Controls/FluTableView.qml +++ b/src/imports/FluentUI/Controls/FluTableView.qml @@ -170,7 +170,6 @@ Rectangle { } boundsBehavior: Flickable.StopAtBounds ScrollBar.horizontal: FluScrollBar{} - maximumFlickVelocity: 1680 ScrollBar.vertical: FluScrollBar{} selectionModel: ItemSelectionModel { id:selection_model diff --git a/src/imports/FluentUI/Controls/FluTreeView.qml b/src/imports/FluentUI/Controls/FluTreeView.qml index f3c7c155..181a669a 100644 --- a/src/imports/FluentUI/Controls/FluTreeView.qml +++ b/src/imports/FluentUI/Controls/FluTreeView.qml @@ -251,7 +251,6 @@ Item { flickableDirection: Flickable.HorizontalAndVerticalFlick clip: true boundsBehavior: ListView.StopAtBounds - maximumFlickVelocity: 1680 ScrollBar.vertical: FluScrollBar {} ScrollBar.horizontal: FluScrollBar { } }