From 6207752cea17537bfc9b95017df7ee07fab67760 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Tue, 1 Dec 2020 17:13:07 -0800 Subject: [PATCH 1/2] responsive size fixes --- ResponsiveContainer.qml | 3 ++- theme/Theme.qml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ResponsiveContainer.qml b/ResponsiveContainer.qml index 7c9af55..d796a64 100644 --- a/ResponsiveContainer.qml +++ b/ResponsiveContainer.qml @@ -3,6 +3,7 @@ import QtQuick.Controls 2.4 import QtQuick.Controls.Material 2.0 import QtQuick.Layouts 1.3 import QtQuick.Controls 1.4 +import "theme" GridLayout { @@ -10,7 +11,7 @@ GridLayout { // have children ... control weather to stack or row them // n * minWidth determin - property int minCellWidth: 500 + property int minCellWidth: Theme.sidePaneMinSize * gcd.themeScale onWidthChanged: resizeCheck() diff --git a/theme/Theme.qml b/theme/Theme.qml index af18a14..4422fcf 100644 --- a/theme/Theme.qml +++ b/theme/Theme.qml @@ -106,7 +106,7 @@ Item { readonly property int contactPortraitSize: 75 readonly property int sidePaneMinSize: 700 - readonly property int doublePaneMinSize: 1000 + readonly property int doublePaneMinSize: 1400 property ThemeType dark: CwtchDark{} property ThemeType light: CwtchLight{} -- 2.25.1 From da9701e8160e888e8709f0d585e3f75c679df1b8 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Wed, 2 Dec 2020 11:59:15 -0800 Subject: [PATCH 2/2] portrait use gcd.themeScale instead of logScale --- Portrait.qml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Portrait.qml b/Portrait.qml index a64d81a..ea8dbf0 100644 --- a/Portrait.qml +++ b/Portrait.qml @@ -13,9 +13,8 @@ Item { property alias badgeColor: badge.color property int size: Theme.contactPortraitSize - property real logscale: 4 * Math.log10(gcd.themeScale + 1) - property int baseWidth: size * logscale - height: size * logscale + property int baseWidth: size * gcd.themeScale + height: size * gcd.themeScale property alias portraitBorderColor: mainImage.color property alias portraitColor: imageInner.color -- 2.25.1