aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnatoly Kozlov <AnKozlov@luxoft.com>2018-03-28 10:12:12 +0200
committerDaniel d'Andrada <daniel.dandrada@luxoft.com>2018-03-28 08:29:28 +0000
commit8dbcf8ff5460d2ebff08d409dac30e75767ea22e (patch)
tree8ec8599af2fa04f4cdb64c76fef0450d06c0b251
parentb820af079cdfb872ec3079e380fded643909620a (diff)
[sysui] Fix scaling for the exposed rectangle
Task-number: AUTOSUITE-253 Change-Id: Ic6643422bbef0d6d4fb3890f70d2db596d3b6e00 Reviewed-by: Daniel d'Andrada <daniel.dandrada@luxoft.com>
-rw-r--r--sysui/display/Display.qml2
-rw-r--r--sysui/launcher/Launcher.qml2
2 files changed, 2 insertions, 2 deletions
diff --git a/sysui/display/Display.qml b/sysui/display/Display.qml
index 632b6ae2..335272dc 100644
--- a/sysui/display/Display.qml
+++ b/sysui/display/Display.qml
@@ -93,7 +93,7 @@ Item {
property var exposedRectTopMarginBinding: Binding {
target: model.appInfo
property: "exposedRectTopMargin"
- value: model.appInfo.active ? launcherLoader.y + NeptuneStyle.dp(Style.launcherHeight) : 0
+ value: model.appInfo.active ? launcherLoader.y + (launcherLoader.item.open ? NeptuneStyle.dp(Style.launcherHeight) : launcherLoader.height) : 0
}
property var windowHeightBinding: Binding {
diff --git a/sysui/launcher/Launcher.qml b/sysui/launcher/Launcher.qml
index 8a4968b1..9d372c8a 100644
--- a/sysui/launcher/Launcher.qml
+++ b/sysui/launcher/Launcher.qml
@@ -176,7 +176,7 @@ Item {
}
PropertyChanges {
target: root
- height: Style.launcherHeight
+ height: NeptuneStyle.dp(Style.launcherHeight)
}
},