diff options
| author | Caroline Chao <caroline.chao@digia.com> | 2014-05-10 10:53:08 +0200 |
|---|---|---|
| committer | Caroline Chao <caroline.chao@digia.com> | 2014-05-15 08:41:39 +0200 |
| commit | a767530b655658df18f95e66e85410e8eeb3c1be (patch) | |
| tree | 06a69fe8d7f638c32231cbe0396ff6dcf963f2fc | |
| parent | 59014b31d3a715ae8975d4f07e78ca1e34104767 (diff) | |
Make the height of the row delegate an application constant
Since it is used at different places.
Change-Id: I9cecc118871d948f0cabd80d35cb07a12ccd1b88
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
| -rw-r--r-- | qml/pages/LongTermPage.qml | 2 | ||||
| -rw-r--r-- | qml/touch/ListViewDelegate.qml | 7 | ||||
| -rw-r--r-- | src/applicationinfo.cpp | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/qml/pages/LongTermPage.qml b/qml/pages/LongTermPage.qml index 67fbc91..490543d 100644 --- a/qml/pages/LongTermPage.qml +++ b/qml/pages/LongTermPage.qml @@ -65,7 +65,7 @@ BasicPage { id: item width: scrollview.width implicitHeight: grid.implicitHeight - property int rowHeight: 118 * ApplicationInfo.ratio + 1 + property int rowHeight: ApplicationInfo.constants.rowDelegateHeight + 1 Repeater { id: repeater model: cityLoaded ? ApplicationInfo.currentCityModel.daysCount() : null diff --git a/qml/touch/ListViewDelegate.qml b/qml/touch/ListViewDelegate.qml index c34fe1b..d7a033e 100644 --- a/qml/touch/ListViewDelegate.qml +++ b/qml/touch/ListViewDelegate.qml @@ -44,7 +44,7 @@ import org.qtproject.demo.weather 1.0 Rectangle { id: rect - height: 118 * ApplicationInfo.ratio + height: ApplicationInfo.constants.rowDelegateHeight width: parent.width signal clicked signal deleteCity @@ -134,8 +134,8 @@ Rectangle { } MouseArea { id: deleteMouse - implicitWidth: 110 * ApplicationInfo.ratio - implicitHeight: 110 * ApplicationInfo.ratio + implicitWidth: ApplicationInfo.constants.rowDelegateHeight + implicitHeight: implicitWidth Layout.minimumWidth: implicitWidth onClicked: if (!isSearchView) rect.deleteCity() Image { @@ -147,6 +147,7 @@ Rectangle { } Rectangle { anchors.fill: parent + anchors.margins: 8 * ApplicationInfo.ratio color: ApplicationInfo.colors.smokeGray opacity: deleteMouse.pressed ? 1 : 0 z: -1 diff --git a/src/applicationinfo.cpp b/src/applicationinfo.cpp index cc9cec9..a1e6326 100644 --- a/src/applicationinfo.cpp +++ b/src/applicationinfo.cpp @@ -89,6 +89,8 @@ ApplicationInfo::ApplicationInfo(WeatherImageProvider *provider) m_hMargin = m_isPortraitMode ? 20 * ratio() : 50 * ratio(); m_applicationWidth = m_isMobile ? rect.width() : 1120; + m_constants->insert(QLatin1String("rowDelegateHeight"), QVariant(getSizeWithRatio(118))); + m_currentIndexDay = -1; if (m_isMobile) |