diff options
| author | Daniel d'Andrada <daniel.dandrada@luxoft.com> | 2018-03-29 09:35:24 +0200 |
|---|---|---|
| committer | Lukáš Tinkl <ltinkl@luxoft.com> | 2018-03-30 08:29:37 +0000 |
| commit | 63d3547e42060bbbb8e65e5ec82950501a204d3f (patch) | |
| tree | 6ae50751b86a581b46addaf2a98564a23ac2fef6 | |
| parent | 75f7dd2fe626796946c015208f827949cfff7be0 (diff) | |
[sysui] Set the initial scale value of client windows
Change-Id: I9e01e734bc067d003acccea9bccb172dfc2b5f7c
Reviewed-by: Lukáš Tinkl <ltinkl@luxoft.com>
| -rw-r--r-- | imports/system/models/application/ApplicationInfo.qml | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/imports/system/models/application/ApplicationInfo.qml b/imports/system/models/application/ApplicationInfo.qml index 11268b02..dfe58890 100644 --- a/imports/system/models/application/ApplicationInfo.qml +++ b/imports/system/models/application/ApplicationInfo.qml @@ -132,6 +132,7 @@ QtObject { onWindowChanged: { if (window) { + AM.WindowManager.setWindowProperty(window, "neptuneScale", windowScale); AM.WindowManager.setWindowProperty(window, "neptuneWidgetHeight", widgetHeight); AM.WindowManager.setWindowProperty(window, "neptuneCurrentWidth", currentWidth); AM.WindowManager.setWindowProperty(window, "neptuneCurrentHeight", currentHeight); @@ -146,10 +147,6 @@ QtObject { if (window) AM.WindowManager.setWindowProperty(window, "neptuneScale", windowScale); } - onSecondaryWindowScaleChanged: { - if (secondaryWindow) - AM.WindowManager.setWindowProperty(secondaryWindow, "neptuneScale", secondaryWindowScale); - } onWidgetHeightChanged: { if (window) AM.WindowManager.setWindowProperty(window, "neptuneWidgetHeight", widgetHeight); @@ -179,6 +176,16 @@ QtObject { AM.WindowManager.setWindowProperty(window, "locale", localeCode); } + onSecondaryWindowChanged: { + if (secondaryWindow) + AM.WindowManager.setWindowProperty(secondaryWindow, "neptuneScale", secondaryWindowScale); + } + + onSecondaryWindowScaleChanged: { + if (secondaryWindow) + AM.WindowManager.setWindowProperty(secondaryWindow, "neptuneScale", secondaryWindowScale); + } + onAsWidgetChanged: { if (asWidget && application.runState === AM.Application.NotRunning) { // Starting an app causes it to emit activated() but we don't want it to go active (as being |