diff options
| author | Nicolas Werner <nicolas.werner@hotmail.de> | 2021-06-13 01:48:11 +0200 |
|---|---|---|
| committer | Nicolas Werner <nicolas.werner@hotmail.de> | 2021-06-13 01:51:09 +0200 |
| commit | 88039083213a37ad132461429f7122e651874717 (patch) | |
| tree | a7731ca2c4b3ae042249304e167b670bde860bc7 /resources/qml/components | |
| parent | Don't read avatarUrl from local profile, if no global avatar is set (diff) | |
| download | nheko-88039083213a37ad132461429f7122e651874717.tar.xz | |
Try to be compatible with Qt 5.12
Diffstat (limited to 'resources/qml/components')
| -rw-r--r-- | resources/qml/components/AdaptiveLayout.qml | 18 | ||||
| -rw-r--r-- | resources/qml/components/AdaptiveLayoutElement.qml | 4 |
2 files changed, 15 insertions, 7 deletions
diff --git a/resources/qml/components/AdaptiveLayout.qml b/resources/qml/components/AdaptiveLayout.qml index eea85e38..1d44ba90 100644 --- a/resources/qml/components/AdaptiveLayout.qml +++ b/resources/qml/components/AdaptiveLayout.qml @@ -2,8 +2,8 @@ // // SPDX-License-Identifier: GPL-3.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 +import QtQuick 2.12 +import QtQuick.Controls 2.5 import QtQuick.Layouts 1.15 import im.nheko 1.0 @@ -87,6 +87,13 @@ Container { x: parent.preferredWidth z: 3 + CursorShape { + height: parent.height + width: container.splitterGrabMargin * 2 + x: -container.splitterGrabMargin + cursorShape: Qt.SizeHorCursor + } + DragHandler { id: dragHandler @@ -96,9 +103,9 @@ Container { xAxis.minimum: splitter.minimumWidth - 1 xAxis.maximum: splitter.maximumWidth margin: container.splitterGrabMargin - dragThreshold: 0 + //dragThreshold: 0 grabPermissions: PointerHandler.CanTakeOverFromAnything | PointerHandler.ApprovesTakeOverByHandlersOfSameType - cursorShape: Qt.SizeHorCursor + //cursorShape: Qt.SizeHorCursor onActiveChanged: { if (!active) splitter.parent.preferredWidth = splitter.x; @@ -107,9 +114,10 @@ Container { } HoverHandler { + //cursorShape: Qt.SizeHorCursor + enabled: !container.singlePageMode margin: container.splitterGrabMargin - cursorShape: Qt.SizeHorCursor } } diff --git a/resources/qml/components/AdaptiveLayoutElement.qml b/resources/qml/components/AdaptiveLayoutElement.qml index 411f6c64..3922e27d 100644 --- a/resources/qml/components/AdaptiveLayoutElement.qml +++ b/resources/qml/components/AdaptiveLayoutElement.qml @@ -2,8 +2,8 @@ // // SPDX-License-Identifier: GPL-3.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 +import QtQuick 2.12 +import QtQuick.Controls 2.5 import QtQuick.Layouts 1.15 Item { |