diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index 59c842a0..7938f2d1 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -15,7 +15,7 @@ endif() file(TO_CMAKE_PATH "/" PATH_SEPARATOR) #设置版本号 -add_definitions(-DVERSION=1,3,7,3) +add_definitions(-DVERSION=1,3,7,4) #判断FluentUI库类型 if(FLUENTUI_BUILD_STATIC_LIB) diff --git a/example/qml/page/T_Awesome.qml b/example/qml/page/T_Awesome.qml index 098fb18c..1804475f 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/window/MainWindow.qml b/example/qml/window/MainWindow.qml index d6f86dc6..bbe00487 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 7ca6024b..b4ef5cd0 100644 --- a/example/src/main.cpp +++ b/example/src/main.cpp @@ -37,7 +37,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 a06fce0f..77a469b9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -7,7 +7,7 @@ project(fluentuiplugin LANGUAGES CXX) 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(Qt5 REQUIRED COMPONENTS Core Quick Qml)