From 42a7813776a44ebf4166334e8e82d21878a01d0f Mon Sep 17 00:00:00 2001 From: Sebastian Wolf Date: Sat, 2 Dec 2023 23:50:13 +0100 Subject: [PATCH] Not only tablets have widescreen ;) --- qml/components/MessageListViewItem.qml | 8 ++++---- qml/components/settingsPage/ResponsiveGrid.qml | 2 +- qml/js/functions.js | 2 +- qml/pages/ChatPage.qml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qml/components/MessageListViewItem.qml b/qml/components/MessageListViewItem.qml index b4763d3..514ff41 100644 --- a/qml/components/MessageListViewItem.qml +++ b/qml/components/MessageListViewItem.qml @@ -129,7 +129,7 @@ ListItem { } function getContentWidthMultiplier() { - return Functions.isTablet(appWindow) ? 0.4 : 1.0 + return Functions.isWidescreen(appWindow) ? 0.4 : 1.0 } onClicked: { @@ -377,10 +377,10 @@ ListItem { id: messageTextRow spacing: Theme.paddingSmall width: precalculatedValues.entryWidth - anchors.horizontalCenter: Functions.isTablet(appWindow) ? undefined : parent.horizontalCenter - anchors.left: Functions.isTablet(appWindow) ? parent.left : undefined + anchors.horizontalCenter: Functions.isWidescreen(appWindow) ? undefined : parent.horizontalCenter + anchors.left: Functions.isWidescreen(appWindow) ? parent.left : undefined y: Theme.paddingSmall - anchors.leftMargin: Functions.isTablet(appWindow) ? Theme.paddingMedium : undefined + anchors.leftMargin: Functions.isWidescreen(appWindow) ? Theme.paddingMedium : undefined Loader { id: profileThumbnailLoader diff --git a/qml/components/settingsPage/ResponsiveGrid.qml b/qml/components/settingsPage/ResponsiveGrid.qml index 8caf663..a5bc592 100644 --- a/qml/components/settingsPage/ResponsiveGrid.qml +++ b/qml/components/settingsPage/ResponsiveGrid.qml @@ -23,6 +23,6 @@ import "../../js/functions.js" as Functions Grid { width: parent.width - ( 2 * x ) - columns: Functions.isTablet(appWindow) ? 2 : 1 + columns: Functions.isWidescreen(appWindow) ? 2 : 1 readonly property real columnWidth: width/columns } diff --git a/qml/js/functions.js b/qml/js/functions.js index 65a3d94..5bdd751 100644 --- a/qml/js/functions.js +++ b/qml/js/functions.js @@ -536,6 +536,6 @@ function getMessagesNeededForwardPermissions(messages) { return neededPermissions } -function isTablet(appWindow) { +function isWidescreen(appWindow) { return (appWindow.deviceOrientation & Silica.Orientation.LandscapeMask) || Silica.Screen.sizeCategory === Silica.Screen.Large || Silica.Screen.sizeCategory === Silica.Screen.ExtraLarge } diff --git a/qml/pages/ChatPage.qml b/qml/pages/ChatPage.qml index 3fd9e8a..0b80651 100644 --- a/qml/pages/ChatPage.qml +++ b/qml/pages/ChatPage.qml @@ -1187,7 +1187,7 @@ Page { readonly property int pageMarginDouble: 2 * Theme.horizontalPageMargin readonly property int paddingMediumDouble: 2 * Theme.paddingMedium readonly property int entryWidth: chatView.width - pageMarginDouble //ширина полной строки сообщения вместе с аватаркой - readonly property int entryWidth: Functions.isTablet(appWindow) ? chatView.width * 0.75 : chatView.width - pageMarginDouble + readonly property int entryWidth: Functions.isWidescreen(appWindow) ? chatView.width * 0.75 : chatView.width - pageMarginDouble readonly property int textItemWidth: entryWidth - profileThumbnailDimensions - Theme.paddingSmall readonly property int backgroundWidth: page.isPrivateChat ? textItemWidth - pageMarginDouble : textItemWidth //уменьшенная ширина сообщений для приватных чатов readonly property int backgroundRadius: textItemWidth/50