diff --git a/imports/NeoChat/Component/ChatBox/ChatBar.qml b/imports/NeoChat/Component/ChatBox/ChatBar.qml index add0dc6e5..d8ceb2537 100644 --- a/imports/NeoChat/Component/ChatBox/ChatBar.qml +++ b/imports/NeoChat/Component/ChatBox/ChatBar.qml @@ -117,10 +117,6 @@ ToolBar { selectedTextColor: Kirigami.Theme.highlightedTextColor hoverEnabled: !Kirigami.Settings.tabletMode - // Work around Qt bug where NativeRendering breaks for non-integer scale factors - // https://bugreports.qt.io/browse/QTBUG-67007 - renderType: Screen.devicePixelRatio % 1 !== 0 ? Text.QtRendering : Text.NativeRendering - selectByMouse: !Kirigami.Settings.tabletMode cursorDelegate: Loader { diff --git a/imports/NeoChat/Component/Timeline/ReactionDelegate.qml b/imports/NeoChat/Component/Timeline/ReactionDelegate.qml index 7ac7a8fca..ad6b22777 100644 --- a/imports/NeoChat/Component/Timeline/ReactionDelegate.qml +++ b/imports/NeoChat/Component/Timeline/ReactionDelegate.qml @@ -29,7 +29,7 @@ Flow { shadow.size: Kirigami.Units.smallSpacing shadow.color: !model.isHighlighted ? Qt.rgba(0.0, 0.0, 0.0, 0.10) : Qt.rgba(Kirigami.Theme.textColor.r, Kirigami.Theme.textColor.g, Kirigami.Theme.textColor.b, 0.10) border.color: Kirigami.ColorUtils.tintWithAlpha(color, Kirigami.Theme.textColor, 0.15) - border.width: Kirigami.Units.devicePixelRatio + border.width: 1 } diff --git a/imports/NeoChat/Component/Timeline/TimelineContainer.qml b/imports/NeoChat/Component/Timeline/TimelineContainer.qml index 835673403..7dc57cc56 100644 --- a/imports/NeoChat/Component/Timeline/TimelineContainer.qml +++ b/imports/NeoChat/Component/Timeline/TimelineContainer.qml @@ -230,7 +230,7 @@ QQC2.ItemDelegate { shadow.size: Kirigami.Units.smallSpacing shadow.color: !model.isHighlighted ? Qt.rgba(0.0, 0.0, 0.0, 0.10) : Qt.rgba(Kirigami.Theme.textColor.r, Kirigami.Theme.textColor.g, Kirigami.Theme.textColor.b, 0.10) border.color: Kirigami.ColorUtils.tintWithAlpha(color, Kirigami.Theme.textColor, 0.15) - border.width: Kirigami.Units.devicePixelRatio + border.width: 1 } } } diff --git a/imports/NeoChat/Page/RoomListPage.qml b/imports/NeoChat/Page/RoomListPage.qml index 4b651efbf..9fb995e9f 100644 --- a/imports/NeoChat/Page/RoomListPage.qml +++ b/imports/NeoChat/Page/RoomListPage.qml @@ -87,8 +87,8 @@ Kirigami.ScrollablePage { Kirigami.Icon { anchors.centerIn: parent - width: 22 * Kirigami.Units.devicePixelRatio - height: 22 * Kirigami.Units.devicePixelRatio + width: 22 + height: 22 source: "search" } Kirigami.Separator { diff --git a/imports/NeoChat/Page/RoomPage.qml b/imports/NeoChat/Page/RoomPage.qml index 899ec3eed..32e9b8ea0 100644 --- a/imports/NeoChat/Page/RoomPage.qml +++ b/imports/NeoChat/Page/RoomPage.qml @@ -588,7 +588,7 @@ Kirigami.ScrollablePage { shadow.size: Kirigami.Units.smallSpacing shadow.color: Qt.rgba(0.0, 0.0, 0.0, 0.10) border.color: Kirigami.ColorUtils.tintWithAlpha(color, Kirigami.Theme.textColor, 0.15) - border.width: Kirigami.Units.devicePixelRatio + border.width: 1 } Timer { diff --git a/imports/NeoChat/Settings/AppearanceSettingsPage.qml b/imports/NeoChat/Settings/AppearanceSettingsPage.qml index 73454e7ae..21e6d0794 100644 --- a/imports/NeoChat/Settings/AppearanceSettingsPage.qml +++ b/imports/NeoChat/Settings/AppearanceSettingsPage.qml @@ -52,7 +52,7 @@ Kirigami.ScrollablePage { shadow.size: Kirigami.Units.smallSpacing shadow.color: Qt.rgba(0.0, 0.0, 0.0, 0.10) border.color: Kirigami.ColorUtils.tintWithAlpha(color, Kirigami.Theme.textColor, 0.15) - border.width: Kirigami.Units.devicePixelRatio + border.width: 1 } } }, @@ -89,7 +89,7 @@ Kirigami.ScrollablePage { shadow.size: Kirigami.Units.smallSpacing shadow.color: Qt.rgba(0.0, 0.0, 0.0, 0.10) border.color: Kirigami.ColorUtils.tintWithAlpha(color, Kirigami.Theme.textColor, 0.15) - border.width: Kirigami.Units.devicePixelRatio + border.width: 1 } } } diff --git a/qml/main.qml b/qml/main.qml index 618f82640..3bf7ff19a 100644 --- a/qml/main.qml +++ b/qml/main.qml @@ -198,7 +198,7 @@ Kirigami.ApplicationWindow { anchors.bottom: parent.bottom x: root.pageStack.defaultColumnWidth - (width / 2) - width: Kirigami.Units.devicePixelRatio * 2 + width: 2 property int _lastX: -1 enabled: !Kirigami.Settings.isMobile