.cmake/GetGitRevisionDescription.cmake.in

@@ -1,7 +1,27 @@
+#
+# 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")
+	# named branch
 	string(REPLACE "ref: " "" HEAD_REF "${HEAD_CONTENTS}")
 	if(EXISTS "@GIT_DIR@/${HEAD_REF}")
 		configure_file("@GIT_DIR@/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY)
@@ -13,8 +33,10 @@ if(HEAD_CONTENTS MATCHES "ref")
 		endif()
 	endif()
 else()
+	# 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)
 	string(STRIP "${HEAD_HASH}" HEAD_HASH)

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,31 +82,6 @@ Button {
                 Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
                 visible: display !== Button.IconOnly
             }
-        }
-    }
-    Component{
-        id:com_column
-        ColumnLayout{
-            Loader{
-                sourceComponent: iconDelegate
-                Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
-                visible: display !== Button.TextOnly
-            }
-            FluText{
-                text:control.text
-                Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
-                visible: display !== Button.IconOnly
-            }
-        }
-    }
-    contentItem:Loader{
-        sourceComponent: {
-            if(display === Button.TextUnderIcon){
-                return com_column
-            }
-            return com_row
-        }
-    }
             FluTooltip{
                 id:tool_tip
                 visible: {
@@ -121,3 +97,44 @@ Button {
                 delay: 1000
             }
         }
+    }
+
+    Component{
+        id:com_column
+        ColumnLayout{
+            Loader{
+                sourceComponent: iconDelegate
+                Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
+                visible: display !== Button.TextOnly
+            }
+            FluText{
+                text:control.text
+                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){
+                return com_column
+            }
+            return com_row
+        }
+    }
+}

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

@@ -69,6 +69,7 @@ Button {
             iconSource: control.iconSource
         }
     }
+
     Component{
         id:com_row
         RowLayout{
@@ -82,31 +83,6 @@ Button {
                 Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
                 visible: display !== Button.IconOnly
             }
-        }
-    }
-    Component{
-        id:com_column
-        ColumnLayout{
-            Loader{
-                sourceComponent: iconDelegate
-                Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
-                visible: display !== Button.TextOnly
-            }
-            FluText{
-                text:control.text
-                Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
-                visible: display !== Button.IconOnly
-            }
-        }
-    }
-    contentItem:Loader{
-        sourceComponent: {
-            if(display === Button.TextUnderIcon){
-                return com_column
-            }
-            return com_row
-        }
-    }
             FluTooltip{
                 id:tool_tip
                 visible: {
@@ -122,3 +98,44 @@ Button {
                 delay: 1000
             }
         }
+    }
+
+    Component{
+        id:com_column
+        ColumnLayout{
+            Loader{
+                sourceComponent: iconDelegate
+                Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
+                visible: display !== Button.TextOnly
+            }
+            FluText{
+                text:control.text
+                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){
+                return com_column
+            }
+            return com_row
+        }
+    }
+}