From 2783a52aa28044856aaa6dd6453906dbf1f501f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=EA=A6=AB=EA=A6=B6=EA=A6=8F=EA=A7=80=EA=A6=A6?= =?UTF-8?q?=EA=A6=BF=EA=A6=A7=EA=A6=AE=EA=A6=91=EA=A6=A9=EA=A6=AD=EA=A7=80?= Date: Mon, 3 Jul 2023 18:22:45 +0800 Subject: Card height isn't forced by cell height now Instead, it's determined by its contents. --- Home/Default.ui.qml | 2 -- Home/Default/Card.ui.qml | 11 +++++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Home/Default.ui.qml b/Home/Default.ui.qml index 98d56f0..2a1aecb 100644 --- a/Home/Default.ui.qml +++ b/Home/Default.ui.qml @@ -371,8 +371,6 @@ Flickable { delegate: Default.Card { width: tabPane .cellWidth - height: tabPane - .cellHeight imageSource: image badgeText: level badgeColor: levelColor diff --git a/Home/Default/Card.ui.qml b/Home/Default/Card.ui.qml index bcebb31..ecaafbf 100644 --- a/Home/Default/Card.ui.qml +++ b/Home/Default/Card.ui.qml @@ -27,6 +27,8 @@ Item { property real rating: 4.0 property alias footer: footer + height: rectangle.height + 25.6 + DrpShdw.Box { source: rectangle anchors.fill: rectangle @@ -36,10 +38,13 @@ Item { id: rectangle radius: 8 color: Eduport.bsCardBg + height: image.height + body.height anchors { - fill: parent + top: parent.top topMargin: 25.6 + left: parent.left leftMargin: 12.8 + right: parent.right rightMargin: 12.8 } @@ -74,13 +79,15 @@ Item { ColumnLayout { id: body + height: badgeAndFavorite.height + + title.height + + truncatedText.height anchors { top: image.bottom left: parent.left leftMargin: 20 right: parent.right rightMargin: 20 - bottom: footer.top } Item { -- cgit v1.2.3