From d43532986a79aeaf1878c36b098aa5184c44e1ef Mon Sep 17 00:00:00 2001
From: zhuzichu <zhuzichu520@gmail.com>
Date: Sun, 25 Jun 2023 11:30:25 +0800
Subject: [PATCH] update

---
 example/CMakeLists.txt                              | 12 +++++++++---
 src/CMakeLists.txt                                  |  4 +---
 src/imports/FluentUI/Controls/FluCalendarView.qml   |  2 --
 src/imports/FluentUI/Controls/FluNavigationView.qml |  9 +++------
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
index 18da1c1e..94734f1e 100644
--- a/example/CMakeLists.txt
+++ b/example/CMakeLists.txt
@@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 3.20)
 project(example VERSION 0.1 LANGUAGES CXX)
 
 #配置通用编译
-set(CMAKE_AUTOMOC ON)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 if(APPLE)
     set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE)
@@ -20,10 +19,17 @@ endif()
 file(TO_CMAKE_PATH "/" PATH_SEPARATOR)
 
 #设置版本号
-add_definitions(-DVERSION=1,3,6,0)
+add_definitions(-DVERSION=1,3,6,1)
 
 find_package(Qt6 REQUIRED COMPONENTS Quick)
-qt_standard_project_setup()
+
+if(QT_VERSION VERSION_GREATER_EQUAL "6.3")
+    qt_standard_project_setup()
+else()
+    set(CMAKE_AUTOMOC ON)
+    set(CMAKE_AUTORCC ON)
+    set(CMAKE_AUTOUIC ON)
+endif()
 
 #遍历所有Cpp文件
 file(GLOB_RECURSE CPP_FILES *.cpp *.h)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4acab5c5..893c4248 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 3.20)
 project(fluentuiplugin LANGUAGES CXX)
 
 #配置通用编译
-set(CMAKE_AUTOMOC ON)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 if(APPLE)
     set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE)
@@ -13,7 +12,7 @@ endif()
 set(QML_PLUGIN_DIRECTORY ${CMAKE_PREFIX_PATH}/qml/FluentUI)
 
 #设置版本号
-add_definitions(-DVERSION=1,3,6,0)
+add_definitions(-DVERSION=1,3,6,1)
 
 find_package(Qt6 REQUIRED COMPONENTS Core Quick Qml)
 
@@ -25,7 +24,6 @@ else()
     set(CMAKE_AUTOUIC ON)
 endif()
 
-
 #遍历所有Cpp文件
 file(GLOB_RECURSE CPP_FILES *.cpp *.h)
 foreach(filepath ${CPP_FILES})
diff --git a/src/imports/FluentUI/Controls/FluCalendarView.qml b/src/imports/FluentUI/Controls/FluCalendarView.qml
index a477722a..b8591c77 100644
--- a/src/imports/FluentUI/Controls/FluCalendarView.qml
+++ b/src/imports/FluentUI/Controls/FluCalendarView.qml
@@ -243,8 +243,6 @@ Item {
             }
             FluTextButton{
                 id:title
-                leftPadding: 0
-                rightPadding: 0
                 anchors{
                     verticalCenter: parent.verticalCenter
                     left: parent.left
diff --git a/src/imports/FluentUI/Controls/FluNavigationView.qml b/src/imports/FluentUI/Controls/FluNavigationView.qml
index d6f071cf..d5c7a069 100644
--- a/src/imports/FluentUI/Controls/FluNavigationView.qml
+++ b/src/imports/FluentUI/Controls/FluNavigationView.qml
@@ -121,8 +121,7 @@ Item {
             }
             Behavior on height {
                 NumberAnimation{
-                    duration: 167
-                    easing.type: Easing.InCubic
+                    duration: 83
                 }
             }
         }
@@ -138,8 +137,7 @@ Item {
             }
             Behavior on height {
                 NumberAnimation{
-                    duration: 167
-                    easing.type: Easing.InCubic
+                    duration: 83
                 }
             }
             width: layout_list.width
@@ -330,8 +328,7 @@ Item {
         Item{
             Behavior on height {
                 NumberAnimation{
-                    duration: 167
-                    easing.type: Easing.InCubic
+                    duration: 83
                 }
             }
             clip: true