diff --git a/containments/homescreens/folio/package/contents/ui/delegate/WidgetDelegateConfig.qml b/containments/homescreens/folio/package/contents/ui/delegate/WidgetDelegateConfig.qml index 2a6deeed..494850f0 100644 --- a/containments/homescreens/folio/package/contents/ui/delegate/WidgetDelegateConfig.qml +++ b/containments/homescreens/folio/package/contents/ui/delegate/WidgetDelegateConfig.qml @@ -189,6 +189,7 @@ Item { id: button icon.name: 'settings-configure' text: i18n('Options') + display: (resizeFrame.handleContainer.width > Kirigami.Units.gridUnit * 7) ? PC3.Button.TextBesideIcon : PC3.Button.IconOnly readonly property var handleContainer: resizeFrame.handleContainer x: Math.round(handleContainer.x + (handleContainer.width / 2) - (width / 2)) diff --git a/containments/homescreens/folio/package/contents/ui/private/WidgetResizeHandle.qml b/containments/homescreens/folio/package/contents/ui/private/WidgetResizeHandle.qml index 1823eae0..9b26ee61 100644 --- a/containments/homescreens/folio/package/contents/ui/private/WidgetResizeHandle.qml +++ b/containments/homescreens/folio/package/contents/ui/private/WidgetResizeHandle.qml @@ -7,15 +7,17 @@ import '../delegate' MouseArea { id: root - height: 10 - width: 10 + height: 10 + touchPadding * 2 + width: 10 + touchPadding * 2 - cursorShape: Qt.PointingHandCursor + readonly property real touchPadding: 20 property int orientation signal dragEvent(real leftEdgeDelta, real rightEdgeDelta, real topEdgeDelta, real bottomEdgeDelta) + cursorShape: Qt.PointingHandCursor + drag { target: root axis: { @@ -72,7 +74,9 @@ MouseArea { } Rectangle { + id: rect anchors.fill: parent + anchors.margins: root.touchPadding color: 'white' radius: width / 2 @@ -85,8 +89,8 @@ MouseArea { xScale: scaleFactor yScale: scaleFactor - origin.x: root.width / 2 - origin.y: root.height / 2 + origin.x: rect.width / 2 + origin.y: rect.height / 2 } } } diff --git a/containments/homescreens/folio/package/contents/ui/private/WidgetResizeHandleFrame.qml b/containments/homescreens/folio/package/contents/ui/private/WidgetResizeHandleFrame.qml index 20e1a37d..17b5bd57 100644 --- a/containments/homescreens/folio/package/contents/ui/private/WidgetResizeHandleFrame.qml +++ b/containments/homescreens/folio/package/contents/ui/private/WidgetResizeHandleFrame.qml @@ -187,7 +187,7 @@ Item { x: resizeOutline.x + Math.round(resizeOutline.width / 2) - Math.round(width / 2) y: resizeOutline.y - Math.round(height / 2) - width: Math.round(Math.max(height, resizeOutline.width * 0.3)) + width: Math.round(Math.max(height, resizeOutline.width * 0.3)) + touchPadding * 2 onPressed: pressedHandler(orientation) onDragEvent: (leftEdgeDelta, rightEdgeDelta, topEdgeDelta, bottomEdgeDelta) => dragHandler(orientation, leftEdgeDelta, rightEdgeDelta, topEdgeDelta, bottomEdgeDelta) @@ -201,7 +201,7 @@ Item { x: resizeOutline.x - (width / 2) y: resizeOutline.y + (resizeOutline.height / 2) - (height / 2) - height: Math.round(Math.max(width, resizeOutline.height * 0.3)) + height: Math.round(Math.max(width, resizeOutline.height * 0.3)) + touchPadding * 2 onPressed: pressedHandler(orientation) onDragEvent: (leftEdgeDelta, rightEdgeDelta, topEdgeDelta, bottomEdgeDelta) => dragHandler(orientation, leftEdgeDelta, rightEdgeDelta, topEdgeDelta, bottomEdgeDelta) @@ -215,7 +215,7 @@ Item { x: resizeOutline.x + resizeOutline.width - (width / 2) y: resizeOutline.y + (resizeOutline.height / 2) - (height / 2) - height: Math.round(Math.max(width, resizeOutline.height * 0.3)) + height: Math.round(Math.max(width, resizeOutline.height * 0.3)) + touchPadding * 2 onPressed: pressedHandler(orientation) onDragEvent: (leftEdgeDelta, rightEdgeDelta, topEdgeDelta, bottomEdgeDelta) => dragHandler(orientation, leftEdgeDelta, rightEdgeDelta, topEdgeDelta, bottomEdgeDelta) @@ -229,7 +229,7 @@ Item { x: resizeOutline.x + (resizeOutline.width / 2) - (width / 2) y: resizeOutline.y + resizeOutline.height - (height / 2) - width: Math.round(Math.max(height, resizeOutline.width * 0.3)) + width: Math.round(Math.max(height, resizeOutline.width * 0.3)) + touchPadding * 2 onPressed: pressedHandler(orientation) onDragEvent: (leftEdgeDelta, rightEdgeDelta, topEdgeDelta, bottomEdgeDelta) => dragHandler(orientation, leftEdgeDelta, rightEdgeDelta, topEdgeDelta, bottomEdgeDelta)