qtquick|MDI: Improvements for the resize handler

More margin, fixed sizes of some handlers and fixed z order
This commit is contained in:
Sergio Martins
2021-03-03 13:47:14 +00:00
parent 54f17cb546
commit 017f06dcfb
2 changed files with 16 additions and 5 deletions

View File

@@ -19,10 +19,10 @@ Rectangle {
property QtObject frameCpp
readonly property QtObject titleBarCpp: frameCpp ? frameCpp.titleBar : null
readonly property int nonContentsHeight: (titleBar.item ? titleBar.item.heightWhenVisible : 0) + tabbar.height + (2 * contentsMargin) + titleBarContentsMargin
property int contentsMargin: 2
property int contentsMargin: isMDI ? 2 : 1
property int titleBarContentsMargin: 1
property bool hasCustomMouseEventRedirector: false
property int mouseResizeMargin: contentsMargin
property int mouseResizeMargin: 8
readonly property bool isMDI: frameCpp && frameCpp.isMDI
readonly property bool resizeAllowed: root.isMDI && !_kddwDragController.isDragging && _kddwDockRegistry && (!_kddwDockRegistry.frameInMDIResize || _kddwDockRegistry.frameInMDIResize === frameCpp)
@@ -53,6 +53,7 @@ Rectangle {
bottom: parent.bottom
}
width: resizeMargin
shape: Qt.SizeHorCursor
z: 100
frameCpp: root.frameCpp
@@ -67,6 +68,7 @@ Rectangle {
bottom: parent.bottom
}
width: resizeMargin
shape: Qt.SizeHorCursor
z: 100
frameCpp: root.frameCpp
@@ -83,6 +85,7 @@ Rectangle {
}
shape: Qt.SizeVerCursor
height: resizeMargin
z: 100
frameCpp: root.frameCpp
resizeAllowed: root.resizeAllowed
@@ -96,7 +99,8 @@ Rectangle {
bottom: parent.bottom
}
shape: Qt.SizeVerCursor
height: resizeMargin
shape: Qt.SizeVerCursor
z: 100
frameCpp: root.frameCpp
resizeAllowed: root.resizeAllowed
@@ -109,6 +113,8 @@ Rectangle {
bottom: parent.bottom
}
height: width
width: resizeMargin
shape: Qt.SizeFDiagCursor
z: 101
frameCpp: root.frameCpp
@@ -122,6 +128,8 @@ Rectangle {
top: parent.top
}
height: width
width: resizeMargin
shape: Qt.SizeFDiagCursor
z: 101
frameCpp: root.frameCpp
@@ -135,6 +143,8 @@ Rectangle {
top: parent.top
}
height: width
width: resizeMargin
shape: Qt.SizeBDiagCursor
z: 101
frameCpp: root.frameCpp
@@ -148,6 +158,8 @@ Rectangle {
bottom: parent.bottom
}
height: width
width: resizeMargin
shape: Qt.SizeBDiagCursor
z: 101
frameCpp: root.frameCpp

View File

@@ -22,9 +22,8 @@ MouseArea {
required property QtObject frameCpp
hoverEnabled: true
width: resizeMargin
cursorShape: enabled ? shape : Qt.ArrowCursor // Even if disabled the MouseArea changes cursor, as it's different than Item.enabled, so explicitly change cursor if disabled
z: mouseArea.z + 1
enabled: resizeAllowed
onFrameCppChanged: {