diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-08-06 14:29:17 +0200 |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2014-08-06 18:41:41 +0200 |
| commit | 6b8a0dabdc750052512446ee6db06d4033320d48 (patch) | |
| tree | f8954ff6eb41d944a80941ea4dbf2bea281eed5b /src/controls/ApplicationWindow.qml | |
| parent | 42a5930a75b5b05926da8895faa228da9d1e20e5 (diff) | |
| download | qtquickcontrols-6b8a0dabdc750052512446ee6db06d4033320d48.tar.gz | |
Fix ApplicationWindow state / content size
QML Window is not a plain QQuickWindow, but QQuickWindowQmlImpl that
does delayed visibility handling and shows the window in appropriate
state. Thus, ApplicationWindow cannot inherit QQuickWindow or it would
lose all that magic.
QQuickApplicationWindow was added in order for ApplicationWindowStyle
to be able to know whether a custom window color had been set. This
change gets rid of the QQuickWindow subclass and simply compares the
window color to white, which is the default fill color of QQuickWindow.
Change-Id: Ibd95ef0717c2db51246c6a71585e9286e61cef0b
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'src/controls/ApplicationWindow.qml')
| -rw-r--r-- | src/controls/ApplicationWindow.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/ApplicationWindow.qml b/src/controls/ApplicationWindow.qml index 42f0d549..0edfe5ea 100644 --- a/src/controls/ApplicationWindow.qml +++ b/src/controls/ApplicationWindow.qml @@ -88,7 +88,7 @@ import QtQuick.Controls.Private 1.0 point to explore this type. */ -ApplicationWindowPrivate { +Window { id: root /*! @@ -221,7 +221,7 @@ ApplicationWindowPrivate { sourceComponent: style property var __control: root property QtObject styleData: QtObject { - readonly property bool hasColor: root.__hasColor + readonly property bool hasColor: root.color != "#ffffff" } onStatusChanged: if (status === Loader.Error) console.error("Failed to load Style for", root) } |