.cmake/GetGitRevisionDescription.cmake

@@ -34,7 +34,7 @@ function(get_git_head_revision _refspecvar _hashvar)
     endif()
     if(NOT "${GIT_DIR}" STREQUAL "")
         file(RELATIVE_PATH _relative_to_source_dir "${CMAKE_SOURCE_DIR}"
-            "${GIT_DIR}")
+             "${GIT_DIR}")
         if("${_relative_to_source_dir}" MATCHES "[.][.]" AND NOT ALLOW_LOOKING_ABOVE_CMAKE_SOURCE_DIR)
             set(GIT_DIR "")
         endif()
@@ -52,23 +52,23 @@ function(get_git_head_revision _refspecvar _hashvar)
     if(NOT IS_DIRECTORY ${GIT_DIR})
         execute_process(
             COMMAND "${GIT_EXECUTABLE}" rev-parse
-            --show-superproject-working-tree
+                    --show-superproject-working-tree
             WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
             OUTPUT_VARIABLE out
             ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
         if(NOT "${out}" STREQUAL "")
             file(READ ${GIT_DIR} submodule)
             string(REGEX REPLACE "gitdir: (.*)$" "\\1" GIT_DIR_RELATIVE
-                ${submodule})
+                                 ${submodule})
             string(STRIP ${GIT_DIR_RELATIVE} GIT_DIR_RELATIVE)
             get_filename_component(SUBMODULE_DIR ${GIT_DIR} PATH)
             get_filename_component(GIT_DIR ${SUBMODULE_DIR}/${GIT_DIR_RELATIVE}
-                ABSOLUTE)
+                                   ABSOLUTE)
             set(HEAD_SOURCE_FILE "${GIT_DIR}/HEAD")
         else()
             file(READ ${GIT_DIR} worktree_ref)
             string(REGEX REPLACE "gitdir: (.*)$" "\\1" git_worktree_dir
-                ${worktree_ref})
+                                 ${worktree_ref})
             string(STRIP ${git_worktree_dir} git_worktree_dir)
             _git_find_closest_git_dir("${git_worktree_dir}" GIT_DIR)
             set(HEAD_SOURCE_FILE "${git_worktree_dir}/HEAD")
@@ -88,7 +88,7 @@ function(get_git_head_revision _refspecvar _hashvar)
     configure_file("${HEAD_SOURCE_FILE}" "${HEAD_FILE}" COPYONLY)
 
     configure_file("${_gitdescmoddir}/GetGitRevisionDescription.cmake.in"
-        "${GIT_DATA}/grabRef.cmake" @ONLY)
+                   "${GIT_DATA}/grabRef.cmake" @ONLY)
     include("${GIT_DATA}/grabRef.cmake")
 
     set(${_refspecvar}
@@ -299,12 +299,12 @@ git_describe(GIT_DESCRIBE)
 git_commit_counts(GIT_COMMIT_COUNT)
 _git_find_closest_git_dir("${CMAKE_CURRENT_SOURCE_DIR}" GIT_DIR)
 if(NOT IS_DIRECTORY ${GIT_DIR})
-    message(STATUS "Current .git not exist")
+  message(STATUS "Current .git not exist")
-    set(GIT_COMMIT_COUNT "1")
+  set(GIT_COMMIT_COUNT "1")
-    set(GIT_DESCRIBE "1.0.0")
+  set(GIT_DESCRIBE "1.0.0")
-    set(GIT_TAG "1.0.0")
+  set(GIT_TAG "1.0.0")
 else()
-    message(STATUS "Current .git exist")
+  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}")

.cmake/GetGitRevisionDescription.cmake.in

@@ -1,21 +1,43 @@
+#
+# Internal file for GetGitRevisionDescription.cmake
+#
+# Requires CMake 2.6 or newer (uses the 'function' command)
+#
+# Original Author:
+# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
+# http://academic.cleardefinition.com
+# Iowa State University HCI Graduate Program/VRAC
+#
+# Copyright 2009-2012, Iowa State University
+# Copyright 2011-2015, Contributors
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+# SPDX-License-Identifier: BSL-1.0
+
 set(HEAD_HASH)
+
 file(READ "@HEAD_FILE@" HEAD_CONTENTS LIMIT 1024)
+
 string(STRIP "${HEAD_CONTENTS}" HEAD_CONTENTS)
 if(HEAD_CONTENTS MATCHES "ref")
-    string(REPLACE "ref: " "" HEAD_REF "${HEAD_CONTENTS}")
+	# named branch
-    if(EXISTS "@GIT_DIR@/${HEAD_REF}")
+	string(REPLACE "ref: " "" HEAD_REF "${HEAD_CONTENTS}")
-        configure_file("@GIT_DIR@/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY)
+	if(EXISTS "@GIT_DIR@/${HEAD_REF}")
-    else()
+		configure_file("@GIT_DIR@/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY)
-        configure_file("@GIT_DIR@/packed-refs" "@GIT_DATA@/packed-refs" COPYONLY)
+	else()
-        file(READ "@GIT_DATA@/packed-refs" PACKED_REFS)
+		configure_file("@GIT_DIR@/packed-refs" "@GIT_DATA@/packed-refs" COPYONLY)
-            if(${PACKED_REFS} MATCHES "([0-9a-z]*) ${HEAD_REF}")
+		file(READ "@GIT_DATA@/packed-refs" PACKED_REFS)
-                set(HEAD_HASH "${CMAKE_MATCH_1}")
+		if(${PACKED_REFS} MATCHES "([0-9a-z]*) ${HEAD_REF}")
-            endif()
+			set(HEAD_HASH "${CMAKE_MATCH_1}")
-    endif()
+		endif()
+	endif()
 else()
-    configure_file("@GIT_DIR@/HEAD" "@GIT_DATA@/head-ref" COPYONLY)
+	# detached HEAD
+	configure_file("@GIT_DIR@/HEAD" "@GIT_DATA@/head-ref" COPYONLY)
 endif()
+
 if(NOT HEAD_HASH)
-    file(READ "@GIT_DATA@/head-ref" HEAD_HASH LIMIT 1024)
+	file(READ "@GIT_DATA@/head-ref" HEAD_HASH LIMIT 1024)
-    string(STRIP "${HEAD_HASH}" HEAD_HASH)
+	string(STRIP "${HEAD_HASH}" HEAD_HASH)
 endif()

example/src/main.cpp

@@ -9,7 +9,6 @@
 #include <FramelessHelper/Quick/framelessquickmodule.h>
 #include <FramelessHelper/Core/private/framelessconfig_p.h>
 #include <QtQml/qqmlextensionplugin.h>
-#include <QLoggingCategory>
 #include "AppInfo.h"
 #include "src/component/CircularReveal.h"
 #include "src/component/FileWatcher.h"
@@ -48,8 +47,6 @@ int main(int argc, char *argv[])
 #endif
     }
     QGuiApplication app(argc, argv);
-//    QLoggingCategory::setFilterRules(QStringLiteral("qt.scenegraph.general=true"));
-//    qSetMessagePattern("%{category}: %{message}");
     FramelessConfig::instance()->set(Global::Option::DisableLazyInitializationForMicaMaterial);
     FramelessConfig::instance()->set(Global::Option::CenterWindowBeforeShow);
     FramelessConfig::instance()->set(Global::Option::ForceNonNativeBackgroundBlur);

src/Qt5/imports/FluentUI/Controls/FluIconButton.qml

@@ -68,6 +68,7 @@ Button {
             iconSource: control.iconSource
         }
     }
+
     Component{
         id:com_row
         RowLayout{
@@ -81,8 +82,23 @@ Button {
                 Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
                 visible: display !== Button.IconOnly
             }
+            FluTooltip{
+                id:tool_tip
+                visible: {
+                    if(control.text === ""){
+                        return false
+                    }
+                    if(control.display !== Button.IconOnly){
+                        return false
+                    }
+                    return hovered
+                }
+                text:control.text
+                delay: 1000
+            }
         }
     }
+
     Component{
         id:com_column
         ColumnLayout{
@@ -96,8 +112,23 @@ Button {
                 Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
                 visible: display !== Button.IconOnly
             }
+            FluTooltip{
+                id:tool_tip
+                visible: {
+                    if(control.text === ""){
+                        return false
+                    }
+                    if(control.display !== Button.IconOnly){
+                        return false
+                    }
+                    return hovered
+                }
+                text:control.text
+                delay: 1000
+            }
         }
     }
+
     contentItem:Loader{
         sourceComponent: {
             if(display === Button.TextUnderIcon){
@@ -106,18 +137,4 @@ Button {
             return com_row
         }
     }
-    FluTooltip{
-        id:tool_tip
-        visible: {
-            if(control.text === ""){
-                return false
-            }
-            if(control.display !== Button.IconOnly){
-                return false
-            }
-            return hovered
-        }
-        text:control.text
-        delay: 1000
-    }
 }

src/Qt6/imports/FluentUI/Controls/FluIconButton.qml

@@ -69,6 +69,7 @@ Button {
             iconSource: control.iconSource
         }
     }
+
     Component{
         id:com_row
         RowLayout{
@@ -82,8 +83,23 @@ Button {
                 Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
                 visible: display !== Button.IconOnly
             }
+            FluTooltip{
+                id:tool_tip
+                visible: {
+                    if(control.text === ""){
+                        return false
+                    }
+                    if(control.display !== Button.IconOnly){
+                        return false
+                    }
+                    return hovered
+                }
+                text:control.text
+                delay: 1000
+            }
         }
     }
+
     Component{
         id:com_column
         ColumnLayout{
@@ -97,8 +113,23 @@ Button {
                 Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
                 visible: display !== Button.IconOnly
             }
+            FluTooltip{
+                id:tool_tip
+                visible: {
+                    if(control.text === ""){
+                        return false
+                    }
+                    if(control.display !== Button.IconOnly){
+                        return false
+                    }
+                    return hovered
+                }
+                text:control.text
+                delay: 1000
+            }
         }
     }
+
     contentItem:Loader{
         sourceComponent: {
             if(display === Button.TextUnderIcon){
@@ -107,18 +138,4 @@ Button {
             return com_row
         }
     }
-    FluTooltip{
-        id:tool_tip
-        visible: {
-            if(control.text === ""){
-                return false
-            }
-            if(control.display !== Button.IconOnly){
-                return false
-            }
-            return hovered
-        }
-        text:control.text
-        delay: 1000
-    }
 }