aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/layouts/qquicklayout_p.h
diff options
context:
space:
mode:
authorSascha Siebert <sascha.siebert@basyskom.com>2017-01-10 18:54:56 +0100
committerJan Arve Sæther <jan-arve.saether@qt.io>2017-11-22 11:28:16 +0000
commit59ce8a850d158658c5ed5f2bdc8b9f2013fe4549 (patch)
tree3331bcbdac1a2980f14b44de091a8a5473c3b40e /src/imports/layouts/qquicklayout_p.h
parentd373d5e7d70e968cfba8957596ed6fe4f46990c8 (diff)
Fix positioning and placement of initially invisible items in layouts
Instead of misusing implicitWidth/Height as a storage mechanism in scenarios where width/height is used for preferred size evaluation, new members are created to hold this information to prevent incorrect sizing in mentioned scenario and get rid of blocking signals. Task-number: QTBUG-57455 Change-Id: I102c45805c4106e5829b17b65c2e247b2381573f Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
Diffstat (limited to 'src/imports/layouts/qquicklayout_p.h')
-rw-r--r--src/imports/layouts/qquicklayout_p.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/imports/layouts/qquicklayout_p.h b/src/imports/layouts/qquicklayout_p.h
index 7984e1bd4d..1e9984e337 100644
--- a/src/imports/layouts/qquicklayout_p.h
+++ b/src/imports/layouts/qquicklayout_p.h
@@ -294,6 +294,9 @@ private:
qreal m_defaultMargins;
QMarginsF m_margins;
+ qreal m_fallbackWidth;
+ qreal m_fallbackHeight;
+
// GridLayout specific properties
int m_row;
int m_column;