summaryrefslogtreecommitdiffstats
path: root/src/widgets/kernel/qlayout_p.h
diff options
context:
space:
mode:
authorSamuel Gaist <samuel.gaist@idiap.ch>2019-10-08 08:05:26 +0200
committerSamuel Gaist <samuel.gaist@idiap.ch>2019-11-15 14:15:24 +0100
commit76a0f94a6d7d85f352e3d4a00c192bfc377cc776 (patch)
treecf6ea2c948558b0b5c1a317d6a29d14e4e150381 /src/widgets/kernel/qlayout_p.h
parent01ec11507d7ef3de09bad9d1ef8e6d4a3d6c4428 (diff)
Take widget content margin into account for menu bar size calculation
The menu bar size calculation didn't take into account the margin of the layout content which makes said menu bar sticking out of the widget. This patch includes the margin to ensure the menu bar has the correct size. Fixes: QTBUG-76585 Change-Id: Ia2c163137fa2889f4028ee3b31766b2747d97b72 Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Diffstat (limited to 'src/widgets/kernel/qlayout_p.h')
-rw-r--r--src/widgets/kernel/qlayout_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/kernel/qlayout_p.h b/src/widgets/kernel/qlayout_p.h
index 8e1d773355..2b19af48be 100644
--- a/src/widgets/kernel/qlayout_p.h
+++ b/src/widgets/kernel/qlayout_p.h
@@ -73,7 +73,7 @@ public:
QLayoutPrivate();
void getMargin(int *result, int userMargin, QStyle::PixelMetric pm) const;
- void doResize(const QSize &);
+ void doResize();
void reparentChildWidgets(QWidget *mw);
bool checkWidget(QWidget *widget) const;
bool checkLayout(QLayout *otherLayout) const;