diff options
| author | Bramastyo Harimukti <bramastyo.harimukti.santoso@pelagicore.com> | 2017-09-29 13:54:37 +0200 |
|---|---|---|
| committer | Bramastyo Harimukti Santoso <bramastyo.harimukti.santoso@pelagicore.com> | 2017-10-05 15:28:16 +0000 |
| commit | f5310e19b99c0e6792dff64aa3e55929d7c73a5c (patch) | |
| tree | 2b082904d163cccc44e5ee9679105ca9c412d828 | |
| parent | fb9c74dc80c8ffcfc26129c32f8109a20cc9f6c1 (diff) | |
| download | neptune-ui-f5310e19b99c0e6792dff64aa3e55929d7c73a5c.tar.gz | |
Fix another jumping content in status bar
- contents in status bar seem to be jumping when a system language
is changed into something else. seems that they don't really have
a correct predefined size when components are created. By specifying
the correct size, will make the content stay in the correct place.
Task-number: QTAUTO-146
Change-Id: Ie06640ee027a8c0e06ccbfce07791948a28908e8
Reviewed-by: Lukáš Tinkl <ltinkl@luxoft.com>
| -rw-r--r-- | sysui/statusbar/DateAndTime.qml | 2 | ||||
| -rw-r--r-- | sysui/statusbar/StatusBar.qml | 9 | ||||
| -rw-r--r-- | sysui/statusbar/Weather.qml | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/sysui/statusbar/DateAndTime.qml b/sysui/statusbar/DateAndTime.qml index e83a9c6..8e73016 100644 --- a/sysui/statusbar/DateAndTime.qml +++ b/sysui/statusbar/DateAndTime.qml @@ -41,7 +41,7 @@ Control { property var currentDate: new Date() width: Style.isPotrait ? Style.hspan(2) : Style.hspan(1.5) - height: Style.vspan(2) + height: Style.vspan(0.9) Label { id: clock diff --git a/sysui/statusbar/StatusBar.qml b/sysui/statusbar/StatusBar.qml index 24bad4e..27de418 100644 --- a/sysui/statusbar/StatusBar.qml +++ b/sysui/statusbar/StatusBar.qml @@ -79,6 +79,7 @@ Pane { RowLayout { spacing: Style.paddingXL * 2 Layout.maximumWidth: Style.hspan(12) + Layout.maximumHeight: Style.statusBarHeight anchors.right: parent.right anchors.top: parent.top anchors.bottom: parent.bottom @@ -86,24 +87,24 @@ Pane { anchors.bottomMargin: Style.padding Weather { - Layout.fillHeight: true visible: !Style.isPotrait } DateAndTime { - Layout.fillHeight: true timeFormat: SettingsModel.clockOption.format currentDate: StatusBarModel.currentDate } Tool { - Layout.fillHeight: true + width: Style.hspan(0.85) + height: Style.vspan(1.05) symbol: "fullscreen" onClicked: SystemModel.windowOverviewVisible = true } Tool { - Layout.fillHeight: true + width: Style.hspan(0.85) + height: Style.vspan(1.05) symbol: "slider_marker" // TODO: Replace with notification icon when available onClicked: SystemModel.notificationCenterVisible = !SystemModel.notificationCenterVisible } diff --git a/sysui/statusbar/Weather.qml b/sysui/statusbar/Weather.qml index ba62a90..1562834 100644 --- a/sysui/statusbar/Weather.qml +++ b/sysui/statusbar/Weather.qml @@ -39,7 +39,7 @@ Control { id: root width: Style.hspan(1.5) - height: Style.vspan(2) + height: Style.vspan(0.9) RowLayout { spacing: Style.padding |