diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-03-13 13:07:33 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-03-13 14:47:27 +0000 |
commit | 95fe95a1deb654ca4b6900243b86632ba02f084e (patch) | |
tree | 3f3e599fe78aef1ff675dc3ebd11a3cd4ad0830a /examples/quickcontrols2/wearable/qml | |
parent | f99863a7c9763e4602948783cba723bf24e8d455 (diff) |
Wearable: tweak the page indicators
Move bottom margin from anchors as bottom padding to define it once.
Change-Id: I2a93f86e2029c38f1d39555a55d969faec716d04
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'examples/quickcontrols2/wearable/qml')
7 files changed, 13 insertions, 30 deletions
diff --git a/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml b/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml index dd0e36da..d44cc29f 100644 --- a/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml +++ b/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml @@ -145,13 +145,10 @@ Item { } QQC2.PageIndicator { - id: pgAlarmsIndicator + count: svAlarmsContainer.count + currentIndex: svAlarmsContainer.currentIndex anchors.bottom: svAlarmsContainer.bottom - anchors.bottomMargin: 1 anchors.horizontalCenter: parent.horizontalCenter - - count: svAlarmsContainer.count - currentIndex: svAlarmsContainer.currentIndex } } diff --git a/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml b/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml index 2f9f4615..392c2a56 100644 --- a/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml +++ b/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml @@ -125,13 +125,10 @@ Item { } QQ2.PageIndicator { - id: pgFitnessIndicator + count: svFitnessContainer.count + currentIndex: svFitnessContainer.currentIndex anchors.bottom: svFitnessContainer.bottom - anchors.bottomMargin: 1 anchors.horizontalCenter: parent.horizontalCenter - - count: svFitnessContainer.count - currentIndex: svFitnessContainer.currentIndex } } diff --git a/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml b/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml index d2ca88a2..24a93e48 100644 --- a/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml +++ b/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml @@ -132,14 +132,11 @@ Item { } QQC2.PageIndicator { - id: pgNotificationsIndicator + count: svNotificationsContainer.count + currentIndex: svNotificationsContainer.currentIndex anchors.bottom: svNotificationsContainer.bottom - anchors.bottomMargin: 1 anchors.horizontalCenter: parent.horizontalCenter - - count: svNotificationsContainer.count - currentIndex: svNotificationsContainer.currentIndex } Component.onCompleted: { diff --git a/examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml b/examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml index 47f09e38..48f3a3d6 100644 --- a/examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml +++ b/examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml @@ -143,13 +143,10 @@ Item { } QQC2.PageIndicator { - id: pgSettingsIndicator + count: svSettingsContainer.count + currentIndex: svSettingsContainer.currentIndex anchors.bottom: svSettingsContainer.bottom - anchors.bottomMargin: 1 anchors.horizontalCenter: parent.horizontalCenter - - count: svSettingsContainer.count - currentIndex: svSettingsContainer.currentIndex } } diff --git a/examples/quickcontrols2/wearable/qml/Style/PageIndicator.qml b/examples/quickcontrols2/wearable/qml/Style/PageIndicator.qml index f12cc360..6a92c42f 100644 --- a/examples/quickcontrols2/wearable/qml/Style/PageIndicator.qml +++ b/examples/quickcontrols2/wearable/qml/Style/PageIndicator.qml @@ -60,6 +60,7 @@ T.PageIndicator { spacing: 6 padding: 6 + bottomPadding: 7 delegate: Rectangle { implicitWidth: 8 diff --git a/examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml b/examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml index 88d5c133..1f24c214 100644 --- a/examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml +++ b/examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml @@ -319,14 +319,11 @@ Item { } QQC2.PageIndicator { - id: pgWeatherIndicator + count: svWeatherContainer.count + currentIndex: svWeatherContainer.currentIndex anchors.bottom: svWeatherContainer.bottom - anchors.bottomMargin: 1 anchors.horizontalCenter: parent.horizontalCenter - - count: svWeatherContainer.count - currentIndex: svWeatherContainer.currentIndex } Component.onCompleted: { WeatherData.requestWeatherData(wDataCntr) diff --git a/examples/quickcontrols2/wearable/qml/WorldClock/WorldClockPage.qml b/examples/quickcontrols2/wearable/qml/WorldClock/WorldClockPage.qml index 5b8a0cd1..cdf96bf2 100644 --- a/examples/quickcontrols2/wearable/qml/WorldClock/WorldClockPage.qml +++ b/examples/quickcontrols2/wearable/qml/WorldClock/WorldClockPage.qml @@ -98,13 +98,10 @@ Item { } QQC2.PageIndicator { - id: pgWatchIndicator + count: svWatchContainer.count + currentIndex: svWatchContainer.currentIndex anchors.bottom: svWatchContainer.bottom - anchors.bottomMargin: 1 anchors.horizontalCenter: parent.horizontalCenter - - count: svWatchContainer.count - currentIndex: svWatchContainer.currentIndex } } |