aboutsummaryrefslogtreecommitdiffstats
path: root/src/controls/qquickcontrol.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/controls/qquickcontrol.cpp')
-rw-r--r--src/controls/qquickcontrol.cpp21
1 files changed, 17 insertions, 4 deletions
diff --git a/src/controls/qquickcontrol.cpp b/src/controls/qquickcontrol.cpp
index 72050811..427dde0f 100644
--- a/src/controls/qquickcontrol.cpp
+++ b/src/controls/qquickcontrol.cpp
@@ -68,8 +68,10 @@ void QQuickControlPrivate::setTopPadding(qreal value, bool reset)
qreal oldPadding = q->topPadding();
topPadding = value;
hasTopPadding = !reset;
- if ((!reset && !qFuzzyCompare(oldPadding, value)) || (reset && !qFuzzyCompare(oldPadding, padding)))
+ if ((!reset && !qFuzzyCompare(oldPadding, value)) || (reset && !qFuzzyCompare(oldPadding, padding))) {
emit q->topPaddingChanged();
+ q->paddingChange();
+ }
}
void QQuickControlPrivate::setLeftPadding(qreal value, bool reset)
@@ -78,8 +80,10 @@ void QQuickControlPrivate::setLeftPadding(qreal value, bool reset)
qreal oldPadding = q->leftPadding();
leftPadding = value;
hasLeftPadding = !reset;
- if ((!reset && !qFuzzyCompare(oldPadding, value)) || (reset && !qFuzzyCompare(oldPadding, padding)))
+ if ((!reset && !qFuzzyCompare(oldPadding, value)) || (reset && !qFuzzyCompare(oldPadding, padding))) {
emit q->leftPaddingChanged();
+ q->paddingChange();
+ }
}
void QQuickControlPrivate::setRightPadding(qreal value, bool reset)
@@ -88,8 +92,10 @@ void QQuickControlPrivate::setRightPadding(qreal value, bool reset)
qreal oldPadding = q->rightPadding();
rightPadding = value;
hasRightPadding = !reset;
- if ((!reset && !qFuzzyCompare(oldPadding, value)) || (reset && !qFuzzyCompare(oldPadding, padding)))
+ if ((!reset && !qFuzzyCompare(oldPadding, value)) || (reset && !qFuzzyCompare(oldPadding, padding))) {
emit q->rightPaddingChanged();
+ q->paddingChange();
+ }
}
void QQuickControlPrivate::setBottomPadding(qreal value, bool reset)
@@ -98,8 +104,10 @@ void QQuickControlPrivate::setBottomPadding(qreal value, bool reset)
qreal oldPadding = q->bottomPadding();
bottomPadding = value;
hasBottomPadding = !reset;
- if ((!reset && !qFuzzyCompare(oldPadding, value)) || (reset && !qFuzzyCompare(oldPadding, padding)))
+ if ((!reset && !qFuzzyCompare(oldPadding, value)) || (reset && !qFuzzyCompare(oldPadding, padding))) {
emit q->bottomPaddingChanged();
+ q->paddingChange();
+ }
}
QQuickControl::QQuickControl(QQuickItem *parent) :
@@ -142,6 +150,7 @@ void QQuickControl::setPadding(qreal padding)
emit rightPaddingChanged();
if (!d->hasBottomPadding)
emit bottomPaddingChanged();
+ paddingChange();
}
void QQuickControl::resetPadding()
@@ -282,4 +291,8 @@ void QQuickControl::mirrorChange()
{
}
+void QQuickControl::paddingChange()
+{
+}
+
QT_END_NAMESPACE