diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-09-15 15:30:27 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@digia.com> | 2014-09-17 10:23:32 +0200 |
| commit | bbcfed6cac95a7d5bea9f29974150e5505e4c612 (patch) | |
| tree | 4213a244dec267302e9f8751d27e0655002f35ba /src/controls/ApplicationWindow.qml | |
| parent | 13d66e8ae27761abfd0b81577c2aa2c7ab3e39c5 (diff) | |
| download | qtquickcontrols-bbcfed6cac95a7d5bea9f29974150e5505e4c612.tar.gz | |
ApplicationWindow: fix top/bottom margins
533b677 broke __topBottomMargins. The y-coordinate of contentArea is
now always 0. It must use the y-coordinate of the corresponding style
layout item instead.
Change-Id: I5316d319f0f12553ecc12a04561c0235100f4dd5
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Diffstat (limited to 'src/controls/ApplicationWindow.qml')
| -rw-r--r-- | src/controls/ApplicationWindow.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/controls/ApplicationWindow.qml b/src/controls/ApplicationWindow.qml index f73c4fa7..2ddff113 100644 --- a/src/controls/ApplicationWindow.qml +++ b/src/controls/ApplicationWindow.qml @@ -158,7 +158,7 @@ Window { property alias __panel: panelLoader.item /*! \internal */ - property real __topBottomMargins: contentArea.y + __panel.statusBarArea.height + property real __topBottomMargins: __panel.contentArea.y + __panel.statusBarArea.height /*! \internal There is a similar macro QWINDOWSIZE_MAX in qwindow_p.h that is used to limit the range of QWindow::maximum{Width,Height} |