diff --git a/src/FluFrameless.cpp b/src/FluFrameless.cpp index 50feb104..3c72e9a5 100644 --- a/src/FluFrameless.cpp +++ b/src/FluFrameless.cpp @@ -195,8 +195,7 @@ bool FluFrameless::nativeEventFilter(const QByteArray &eventType, void *message, if (0 != *result) { return true; } - auto aa = _hitAppBar(); - if(aa){ + if(_hitAppBar()){ *result = HTCAPTION; return true; } diff --git a/src/FluFrameless.h b/src/FluFrameless.h index e3b09477..ce7173d4 100644 --- a/src/FluFrameless.h +++ b/src/FluFrameless.h @@ -47,9 +47,8 @@ private: bool _containsCursorToItem(QQuickItem* item); bool _hitAppBar(); bool _hitMaximizeButton(); - qint64 _current; - private: + qint64 _current; int _edges = 0; int _margins = 8; QList> _hitTestList; diff --git a/src/Qt5/imports/FluentUI/Controls/FluPaneItem.qml b/src/Qt5/imports/FluentUI/Controls/FluPaneItem.qml index 0190b0e1..24756857 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluPaneItem.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluPaneItem.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 2.15 import FluentUI 1.0 QtObject { - readonly property string key : FluTools.uuid() + property string key property int _idx property var _ext property var _parent @@ -22,4 +22,7 @@ QtObject { property var extra property bool showEdit signal tap + Component.onCompleted: { + key = FluTools.uuid() + } } diff --git a/src/Qt5/imports/FluentUI/Controls/FluPaneItemEmpty.qml b/src/Qt5/imports/FluentUI/Controls/FluPaneItemEmpty.qml index 7fdcf69b..75f8922c 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluPaneItemEmpty.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluPaneItemEmpty.qml @@ -3,9 +3,12 @@ import QtQuick.Controls 2.15 import FluentUI 1.0 QtObject { - readonly property string key : FluTools.uuid() + property string key property int _idx property var _ext property var _parent property bool visible: true + Component.onCompleted: { + key = FluTools.uuid() + } } diff --git a/src/Qt5/imports/FluentUI/Controls/FluPaneItemExpander.qml b/src/Qt5/imports/FluentUI/Controls/FluPaneItemExpander.qml index ac90848c..c130a71c 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluPaneItemExpander.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluPaneItemExpander.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 2.15 import FluentUI 1.0 FluObject { - readonly property string key : FluTools.uuid() + property string key property int _idx property bool visible: true property string title @@ -15,4 +15,7 @@ FluObject { property Component iconDelegate property Component menuDelegate property Component editDelegate + Component.onCompleted: { + key = FluTools.uuid() + } } diff --git a/src/Qt5/imports/FluentUI/Controls/FluPaneItemHeader.qml b/src/Qt5/imports/FluentUI/Controls/FluPaneItemHeader.qml index 5b177a65..b8addcdc 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluPaneItemHeader.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluPaneItemHeader.qml @@ -3,9 +3,12 @@ import QtQuick.Controls 2.15 import FluentUI 1.0 QtObject { - readonly property string key : FluTools.uuid() + property string key property int _idx property bool visible: true property string title property var parent + Component.onCompleted: { + key = FluTools.uuid() + } } diff --git a/src/Qt5/imports/FluentUI/Controls/FluPaneItemSeparator.qml b/src/Qt5/imports/FluentUI/Controls/FluPaneItemSeparator.qml index 8d9c7e61..0193b42d 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluPaneItemSeparator.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluPaneItemSeparator.qml @@ -3,10 +3,12 @@ import QtQuick.Controls 2.15 import FluentUI 1.0 QtObject { - readonly property string key : FluTools.uuid() property int _idx property bool visible: true property var parent property real spacing property int size:1 + Component.onCompleted: { + key = FluTools.uuid() + } } diff --git a/src/Qt6/imports/FluentUI/Controls/FluPaneItem.qml b/src/Qt6/imports/FluentUI/Controls/FluPaneItem.qml index d2214015..7b2917a1 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluPaneItem.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluPaneItem.qml @@ -22,4 +22,7 @@ QtObject { property var extra property bool showEdit signal tap + Component.onCompleted: { + key = FluTools.uuid() + } } diff --git a/src/Qt6/imports/FluentUI/Controls/FluPaneItemEmpty.qml b/src/Qt6/imports/FluentUI/Controls/FluPaneItemEmpty.qml index 0f12e384..f5e0135d 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluPaneItemEmpty.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluPaneItemEmpty.qml @@ -3,9 +3,12 @@ import QtQuick.Controls import FluentUI QtObject { - readonly property string key : FluTools.uuid() + property string key property int _idx property var _ext property var _parent property bool visible: true + Component.onCompleted: { + key = FluTools.uuid() + } } diff --git a/src/Qt6/imports/FluentUI/Controls/FluPaneItemExpander.qml b/src/Qt6/imports/FluentUI/Controls/FluPaneItemExpander.qml index 93c2e648..e6d711b4 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluPaneItemExpander.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluPaneItemExpander.qml @@ -3,7 +3,7 @@ import QtQuick.Controls import FluentUI FluObject { - readonly property string key : FluTools.uuid() + property string key property int _idx property bool visible: true property string title @@ -15,4 +15,7 @@ FluObject { property Component iconDelegate property Component menuDelegate property Component editDelegate + Component.onCompleted: { + key = FluTools.uuid() + } } diff --git a/src/Qt6/imports/FluentUI/Controls/FluPaneItemHeader.qml b/src/Qt6/imports/FluentUI/Controls/FluPaneItemHeader.qml index 6918097f..1eff6af0 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluPaneItemHeader.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluPaneItemHeader.qml @@ -3,9 +3,12 @@ import QtQuick.Controls import FluentUI QtObject { - readonly property string key : FluTools.uuid() + property string key property int _idx property bool visible: true property string title property var parent + Component.onCompleted: { + key = FluTools.uuid() + } } diff --git a/src/Qt6/imports/FluentUI/Controls/FluPaneItemSeparator.qml b/src/Qt6/imports/FluentUI/Controls/FluPaneItemSeparator.qml index 23433b68..1360e923 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluPaneItemSeparator.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluPaneItemSeparator.qml @@ -3,10 +3,13 @@ import QtQuick.Controls import FluentUI QtObject { - readonly property string key : FluTools.uuid() + property string key property int _idx property bool visible: true property var parent property real spacing property int size:1 + Component.onCompleted: { + key = FluTools.uuid() + } }