From f7d6d6db15c169094e2c981e2fb95b9ca70204bc Mon Sep 17 00:00:00 2001 From: Thomas Perl Date: Fri, 27 Feb 2015 22:41:19 +0100 Subject: [PATCH] EpisodeDetail: Fix header for long text --- touch/EpisodeDetail.qml | 1 + touch/SlidePageHeader.qml | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/touch/EpisodeDetail.qml b/touch/EpisodeDetail.qml index 799dfe7..536ed23 100644 --- a/touch/EpisodeDetail.qml +++ b/touch/EpisodeDetail.qml @@ -76,6 +76,7 @@ SlidePage { spacing: Constants.layout.padding * pgst.scalef SlidePageHeader { + padding: 0 title: detailPage.title width: parent.width wrapMode: Text.WordWrap diff --git a/touch/SlidePageHeader.qml b/touch/SlidePageHeader.qml index a6955b2..97636fd 100644 --- a/touch/SlidePageHeader.qml +++ b/touch/SlidePageHeader.qml @@ -29,11 +29,12 @@ Item { property alias color: label.color property alias wrapMode: label.wrapMode property bool isOnSlidePage: (typeof(page) !== 'undefined') ? page : null + property real padding: 20 width: parent.width visible: !platform.titleInToolbar || !isOnSlidePage - height: visible ? (Constants.layout.header.height * pgst.scalef) : 0 + height: visible ? (2 * padding * pgst.scalef + label.height) : 0 Binding { target: isOnSlidePage ? page : null @@ -47,13 +48,13 @@ Item { anchors { left: parent.left right: parent.right - rightMargin: 20 * pgst.scalef - leftMargin: 20 * pgst.scalef + rightMargin: slidePageHeader.padding * pgst.scalef + leftMargin: slidePageHeader.padding * pgst.scalef verticalCenter: parent.verticalCenter } color: Constants.colors.highlight - font.pixelSize: parent.height * .4 + font.pixelSize: Constants.layout.header.height * pgst.scalef * .4 elide: Text.ElideRight } }