.cmake/GetGitRevisionDescription.cmake

@@ -292,20 +292,20 @@ git_get_exact_tag(GIT_EXACT_TAG)
 if(GIT_TAG STREQUAL "")
     git_latest_tag(GIT_TAG)
 endif()
-if(GIT_TAG STREQUAL "GIT-TAG-NOTFOUND")
+if(GIT_TAG STREQUAL "HEAD-HASH-NOTFOUND")
     set(GIT_TAG "1.0.0")
 endif ()
+
 git_describe(GIT_DESCRIBE)
+if(GIT_DESCRIBE STREQUAL "HEAD-HASH-NOTFOUND")
+    set(GIT_DESCRIBE "1.0.0")
+endif ()
+
 git_commit_counts(GIT_COMMIT_COUNT)
-_git_find_closest_git_dir("${CMAKE_CURRENT_SOURCE_DIR}" GIT_DIR)
+if(GIT_COMMIT_COUNT STREQUAL "GIT-TAG-NOTFOUND")
-if(NOT IS_DIRECTORY ${GIT_DIR})
+    set(GIT_COMMIT_COUNT "1")
-  message(STATUS "Current .git not exist")
+endif ()
-  set(GIT_COMMIT_COUNT "1")
+
-  set(GIT_DESCRIBE "1.0.0")
-  set(GIT_TAG "1.0.0")
-else()
-  message(STATUS "Current .git exist")
-endif()
 string(REPLACE "." "," GIT_TAG_WITH_COMMA ${GIT_TAG})
 string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" GIT_SEMVER "${GIT_TAG}")
 string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)" SEMVER_SPLITED "${GIT_SEMVER}")

src/imports/FluentUI/Controls/FluCalendarPicker.qml

@@ -9,6 +9,7 @@ Rectangle {
     property color hoverColor: FluTheme.dark ? Qt.rgba(68/255,68/255,68/255,1) : Qt.rgba(251/255,251/255,251/255,1)
     property color normalColor: FluTheme.dark ? Qt.rgba(61/255,61/255,61/255,1) : Qt.rgba(254/255,254/255,254/255,1)
     property string text: "请选择日期"
+    property var window : Window.window
     id:control
     color: {
         if(mouse_area.containsMouse){
@@ -29,10 +30,6 @@ Rectangle {
             popup.showPopup()
         }
     }
-    Item{
-        id:d
-        property var window : Window.window
-    }
     FluText{
         id:text_date
         anchors{
@@ -100,12 +97,12 @@ Rectangle {
         }
         function showPopup() {
             var pos = control.mapToItem(null, 0, 0)
-            if(d.window.height>pos.y+control.height+container.height){
+            if(window.height>pos.y+control.height+container.height){
                 popup.y = control.height
             } else if(pos.y>container.height){
                 popup.y = -container.height
             } else {
-                popup.y = d.window.height-(pos.y+container.height)
+                popup.y = window.height-(pos.y+container.height)
             }
             popup.x = -(popup.width-control.width)/2
             popup.open()

src/imports/FluentUI/Controls/FluColorPicker.qml

@@ -32,10 +32,6 @@ Button{
         }
 
     }
-    Item{
-        id: d
-        property var window : Window.window
-    }
     contentItem: Item{}
     onClicked: {
         popup.showPopup()
@@ -77,12 +73,12 @@ Button{
         }
         function showPopup() {
             var pos = control.mapToItem(null, 0, 0)
-            if(d.window.height>pos.y+control.height+container.height){
+            if(window.height>pos.y+control.height+container.height){
                 popup.y = control.height
             } else if(pos.y>container.height){
                 popup.y = -container.height
             } else {
-                popup.y = d.window.height-(pos.y+container.height)
+                popup.y = window.height-(pos.y+container.height)
             }
             popup.x = -(popup.width-control.width)/2
             popup.open()

src/imports/FluentUI/Controls/FluScreenshot.qml

@@ -13,6 +13,7 @@ Item{
     property var saveFolder: StandardPaths.standardLocations(StandardPaths.PicturesLocation)[0]
     property color borderColor: FluTheme.primaryColor.dark
     signal captrueCompleted(var captrue)
+
     QtObject{
         id:d
         property int dotMouseSize: control.dotSize+10
@@ -517,6 +518,8 @@ Item{
             }
         }
     }
+
+
     function open(){
         loader.sourceComponent = com_screen
     }