Compare commits

..

No commits in common. "5fd934b5f53369e308e574cf085dc5c376a51fe0" and "41cbeef3fdbb7e6bddc2b2ef3a5d801ab076f45d" have entirely different histories.

13 changed files with 14 additions and 43 deletions

View File

@ -195,7 +195,8 @@ bool FluFrameless::nativeEventFilter(const QByteArray &eventType, void *message,
if (0 != *result) { if (0 != *result) {
return true; return true;
} }
if(_hitAppBar()){ auto aa = _hitAppBar();
if(aa){
*result = HTCAPTION; *result = HTCAPTION;
return true; return true;
} }

View File

@ -47,8 +47,9 @@ private:
bool _containsCursorToItem(QQuickItem* item); bool _containsCursorToItem(QQuickItem* item);
bool _hitAppBar(); bool _hitAppBar();
bool _hitMaximizeButton(); bool _hitMaximizeButton();
private:
qint64 _current; qint64 _current;
private:
int _edges = 0; int _edges = 0;
int _margins = 8; int _margins = 8;
QList<QPointer<QQuickItem>> _hitTestList; QList<QPointer<QQuickItem>> _hitTestList;

View File

@ -3,7 +3,7 @@ import QtQuick.Controls 2.15
import FluentUI 1.0 import FluentUI 1.0
QtObject { QtObject {
property string key readonly property string key : FluTools.uuid()
property int _idx property int _idx
property var _ext property var _ext
property var _parent property var _parent
@ -22,7 +22,4 @@ QtObject {
property var extra property var extra
property bool showEdit property bool showEdit
signal tap signal tap
Component.onCompleted: {
key = FluTools.uuid()
}
} }

View File

@ -3,12 +3,9 @@ import QtQuick.Controls 2.15
import FluentUI 1.0 import FluentUI 1.0
QtObject { QtObject {
property string key readonly property string key : FluTools.uuid()
property int _idx property int _idx
property var _ext property var _ext
property var _parent property var _parent
property bool visible: true property bool visible: true
Component.onCompleted: {
key = FluTools.uuid()
}
} }

View File

@ -3,7 +3,7 @@ import QtQuick.Controls 2.15
import FluentUI 1.0 import FluentUI 1.0
FluObject { FluObject {
property string key readonly property string key : FluTools.uuid()
property int _idx property int _idx
property bool visible: true property bool visible: true
property string title property string title
@ -15,7 +15,4 @@ FluObject {
property Component iconDelegate property Component iconDelegate
property Component menuDelegate property Component menuDelegate
property Component editDelegate property Component editDelegate
Component.onCompleted: {
key = FluTools.uuid()
}
} }

View File

@ -3,12 +3,9 @@ import QtQuick.Controls 2.15
import FluentUI 1.0 import FluentUI 1.0
QtObject { QtObject {
property string key readonly property string key : FluTools.uuid()
property int _idx property int _idx
property bool visible: true property bool visible: true
property string title property string title
property var parent property var parent
Component.onCompleted: {
key = FluTools.uuid()
}
} }

View File

@ -3,13 +3,10 @@ import QtQuick.Controls 2.15
import FluentUI 1.0 import FluentUI 1.0
QtObject { QtObject {
property string key readonly property string key : FluTools.uuid()
property int _idx property int _idx
property bool visible: true property bool visible: true
property var parent property var parent
property real spacing property real spacing
property int size:1 property int size:1
Component.onCompleted: {
key = FluTools.uuid()
}
} }

View File

@ -3,7 +3,7 @@ import QtQuick.Controls
import FluentUI import FluentUI
QtObject { QtObject {
property string key readonly property string key : FluTools.uuid()
property int _idx property int _idx
property var _ext property var _ext
property var _parent property var _parent
@ -22,7 +22,4 @@ QtObject {
property var extra property var extra
property bool showEdit property bool showEdit
signal tap signal tap
Component.onCompleted: {
key = FluTools.uuid()
}
} }

View File

@ -3,12 +3,9 @@ import QtQuick.Controls
import FluentUI import FluentUI
QtObject { QtObject {
property string key readonly property string key : FluTools.uuid()
property int _idx property int _idx
property var _ext property var _ext
property var _parent property var _parent
property bool visible: true property bool visible: true
Component.onCompleted: {
key = FluTools.uuid()
}
} }

View File

@ -3,7 +3,7 @@ import QtQuick.Controls
import FluentUI import FluentUI
FluObject { FluObject {
property string key readonly property string key : FluTools.uuid()
property int _idx property int _idx
property bool visible: true property bool visible: true
property string title property string title
@ -15,7 +15,4 @@ FluObject {
property Component iconDelegate property Component iconDelegate
property Component menuDelegate property Component menuDelegate
property Component editDelegate property Component editDelegate
Component.onCompleted: {
key = FluTools.uuid()
}
} }

View File

@ -3,12 +3,9 @@ import QtQuick.Controls
import FluentUI import FluentUI
QtObject { QtObject {
property string key readonly property string key : FluTools.uuid()
property int _idx property int _idx
property bool visible: true property bool visible: true
property string title property string title
property var parent property var parent
Component.onCompleted: {
key = FluTools.uuid()
}
} }

View File

@ -3,13 +3,10 @@ import QtQuick.Controls
import FluentUI import FluentUI
QtObject { QtObject {
property string key readonly property string key : FluTools.uuid()
property int _idx property int _idx
property bool visible: true property bool visible: true
property var parent property var parent
property real spacing property real spacing
property int size:1 property int size:1
Component.onCompleted: {
key = FluTools.uuid()
}
} }

View File

@ -1,6 +1,5 @@
import QtQuick import QtQuick
import QtQuick.Controls import QtQuick.Controls
import QtQuick.Controls.Basic
import FluentUI import FluentUI
Page { Page {