diff --git a/src/controls/Separator.qml b/src/controls/Separator.qml --- a/src/controls/Separator.qml +++ b/src/controls/Separator.qml @@ -31,9 +31,9 @@ */ Rectangle { - height: Units.devicePixelRatio - width: Units.devicePixelRatio - Layout.preferredWidth: Units.devicePixelRatio - Layout.preferredHeight: Units.devicePixelRatio + height: Math.floor(Units.devicePixelRatio) + width: Math.floor(Units.devicePixelRatio) + Layout.preferredWidth: Math.floor(Units.devicePixelRatio) + Layout.preferredHeight: Math.floor(Units.devicePixelRatio) color: Qt.tint(Theme.textColor, Qt.rgba(Theme.backgroundColor.r, Theme.backgroundColor.g, Theme.backgroundColor.b, 0.7)) } diff --git a/src/controls/private/ActionButton.qml b/src/controls/private/ActionButton.qml --- a/src/controls/private/ActionButton.qml +++ b/src/controls/private/ActionButton.qml @@ -41,9 +41,9 @@ readonly property Page page: root.parent.page //either Action or QAction should work here - readonly property QtObject action: root.page ? root.page.mainAction : null - readonly property QtObject leftAction: root.page ? root.page.leftAction : null - readonly property QtObject rightAction: root.page ? root.page.rightAction : null + readonly property QtObject action: root.page && root.page.mainAction && root.page.mainAction.enabled ? root.page.mainAction : null + readonly property QtObject leftAction: root.page && root.page.leftAction && root.page.leftAction.enabled ? root.page.leftAction : null + readonly property QtObject rightAction: root.page && root.page.rightAction && root.page.rightAction.enabled ? root.page.rightAction : null transform: Translate { id: translateTransform