From 9b67ed1dde437448b927ef839ca60a2820f021dc Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Thu, 18 Jun 2015 13:50:50 +0200 Subject: Revert "Rename Control::availableWidth/Height to contentWidth/Height" TextField and TextArea have different semantics for contentWidth and contentHeight. In addition, it looks like we need to restore contentWidth and contentHeight for Frame & GroupBox. This reverts commit 6941b934bdf5f3c7b65f682c8dfc5c6562292351. Change-Id: Ia115025a67b472ac67fbbc915b80312e4b4a7431 Reviewed-by: J-P Nurmi --- src/controls/qquickcontrol.cpp | 42 +++++++++++++++----------------- src/controls/qquickcontrol_p.h | 12 ++++----- src/imports/controls/Button.qml | 4 +-- src/imports/controls/CheckBox.qml | 4 +-- src/imports/controls/GroupBox.qml | 2 +- src/imports/controls/ProgressBar.qml | 6 ++--- src/imports/controls/RadioButton.qml | 4 +-- src/imports/controls/ScrollBar.qml | 4 +-- src/imports/controls/ScrollIndicator.qml | 4 +-- src/imports/controls/Slider.qml | 4 +-- src/imports/controls/Switch.qml | 4 +-- src/imports/controls/TabButton.qml | 4 +-- src/imports/controls/TextArea.qml | 4 +-- src/imports/controls/TextField.qml | 4 +-- src/imports/controls/ToggleButton.qml | 4 +-- src/imports/controls/ToolButton.qml | 4 +-- 16 files changed, 54 insertions(+), 56 deletions(-) (limited to 'src') diff --git a/src/controls/qquickcontrol.cpp b/src/controls/qquickcontrol.cpp index ecf4f50b..e2efbf02 100644 --- a/src/controls/qquickcontrol.cpp +++ b/src/controls/qquickcontrol.cpp @@ -70,7 +70,7 @@ void QQuickControlPrivate::setTopPadding(qreal value, bool reset) hasTopPadding = !reset; if ((!reset && !qFuzzyCompare(oldPadding, value)) || (reset && !qFuzzyCompare(oldPadding, padding))) { emit q->topPaddingChanged(); - emit q->contentHeightChanged(); + emit q->availableHeightChanged(); q->paddingChange(QMarginsF(leftPadding, topPadding, rightPadding, bottomPadding), QMarginsF(leftPadding, oldPadding, rightPadding, bottomPadding)); } @@ -84,7 +84,7 @@ void QQuickControlPrivate::setLeftPadding(qreal value, bool reset) hasLeftPadding = !reset; if ((!reset && !qFuzzyCompare(oldPadding, value)) || (reset && !qFuzzyCompare(oldPadding, padding))) { emit q->leftPaddingChanged(); - emit q->contentWidthChanged(); + emit q->availableWidthChanged(); q->paddingChange(QMarginsF(leftPadding, topPadding, rightPadding, bottomPadding), QMarginsF(oldPadding, topPadding, rightPadding, bottomPadding)); } @@ -98,7 +98,7 @@ void QQuickControlPrivate::setRightPadding(qreal value, bool reset) hasRightPadding = !reset; if ((!reset && !qFuzzyCompare(oldPadding, value)) || (reset && !qFuzzyCompare(oldPadding, padding))) { emit q->rightPaddingChanged(); - emit q->contentWidthChanged(); + emit q->availableWidthChanged(); q->paddingChange(QMarginsF(leftPadding, topPadding, rightPadding, bottomPadding), QMarginsF(leftPadding, topPadding, oldPadding, bottomPadding)); } @@ -112,7 +112,7 @@ void QQuickControlPrivate::setBottomPadding(qreal value, bool reset) hasBottomPadding = !reset; if ((!reset && !qFuzzyCompare(oldPadding, value)) || (reset && !qFuzzyCompare(oldPadding, padding))) { emit q->bottomPaddingChanged(); - emit q->contentHeightChanged(); + emit q->availableHeightChanged(); q->paddingChange(QMarginsF(leftPadding, topPadding, rightPadding, bottomPadding), QMarginsF(leftPadding, topPadding, rightPadding, oldPadding)); } @@ -139,7 +139,7 @@ void QQuickControlPrivate::resizeContent() Q_Q(QQuickControl); if (contentItem) { contentItem->setPosition(QPointF(q->leftPadding(), q->topPadding())); - contentItem->setSize(QSizeF(q->contentWidth(), q->contentHeight())); + contentItem->setSize(QSizeF(q->availableWidth(), q->availableHeight())); } } @@ -154,27 +154,25 @@ QQuickControl::QQuickControl(QQuickControlPrivate &dd, QQuickItem *parent) : } /*! - \qmlproperty real QtQuickControls2::Control::contentWidth - \readonly + \qmlproperty real QtQuickControls2::Control::availableWidth - This property holds the content width, which equals to \c {width - leftPadding - rightPadding}. + This property holds the width available after deducting horizontal padding. \sa padding, leftPadding, rightPadding */ -qreal QQuickControl::contentWidth() const +qreal QQuickControl::availableWidth() const { return width() - leftPadding() - rightPadding(); } /*! - \qmlproperty real QtQuickControls2::Control::contentHeight - \readonly + \qmlproperty real QtQuickControls2::Control::availableHeight - This property holds the content height, which equals to \c {height - topPadding - bottomPadding}. + This property holds the height available after deducting vertical padding. \sa padding, topPadding, bottomPadding */ -qreal QQuickControl::contentHeight() const +qreal QQuickControl::availableHeight() const { return height() - topPadding() - bottomPadding(); } @@ -184,7 +182,7 @@ qreal QQuickControl::contentHeight() const This property holds the default padding. - \sa contentWidth, contentHeight, topPadding, leftPadding, rightPadding, bottomPadding + \sa availableWidth, availableHeight, topPadding, leftPadding, rightPadding, bottomPadding */ qreal QQuickControl::padding() const { @@ -210,9 +208,9 @@ void QQuickControl::setPadding(qreal padding) if (!qFuzzyCompare(newPadding.bottom(), oldPadding.bottom())) emit bottomPaddingChanged(); if (!qFuzzyCompare(newPadding.top(), oldPadding.top()) || !qFuzzyCompare(newPadding.bottom(), oldPadding.bottom())) - emit contentHeightChanged(); + emit availableHeightChanged(); if (!qFuzzyCompare(newPadding.left(), oldPadding.left()) || !qFuzzyCompare(newPadding.right(), oldPadding.right())) - emit contentWidthChanged(); + emit availableWidthChanged(); paddingChange(newPadding, oldPadding); } @@ -226,7 +224,7 @@ void QQuickControl::resetPadding() This property holds the top padding. - \sa padding, bottomPadding, contentHeight + \sa padding, bottomPadding, availableHeight */ qreal QQuickControl::topPadding() const { @@ -253,7 +251,7 @@ void QQuickControl::resetTopPadding() This property holds the left padding. - \sa padding, rightPadding, contentWidth + \sa padding, rightPadding, availableWidth */ qreal QQuickControl::leftPadding() const { @@ -280,7 +278,7 @@ void QQuickControl::resetLeftPadding() This property holds the right padding. - \sa padding, leftPadding, contentWidth + \sa padding, leftPadding, availableWidth */ qreal QQuickControl::rightPadding() const { @@ -307,7 +305,7 @@ void QQuickControl::resetRightPadding() This property holds the bottom padding. - \sa padding, topPadding, contentHeight + \sa padding, topPadding, availableHeight */ qreal QQuickControl::bottomPadding() const { @@ -463,9 +461,9 @@ void QQuickControl::geometryChanged(const QRectF &newGeometry, const QRectF &old d->resizeBackground(); d->resizeContent(); if (newGeometry.width() != oldGeometry.width()) - emit contentWidthChanged(); + emit availableWidthChanged(); if (newGeometry.width() != oldGeometry.height()) - emit contentHeightChanged(); + emit availableHeightChanged(); } void QQuickControl::mirrorChange() diff --git a/src/controls/qquickcontrol_p.h b/src/controls/qquickcontrol_p.h index 72960083..5090985c 100644 --- a/src/controls/qquickcontrol_p.h +++ b/src/controls/qquickcontrol_p.h @@ -58,8 +58,8 @@ class QQuickControlPrivate; class Q_QUICKCONTROLS_EXPORT QQuickControl : public QQuickItem { Q_OBJECT - Q_PROPERTY(qreal contentWidth READ contentWidth NOTIFY contentWidthChanged FINAL) - Q_PROPERTY(qreal contentHeight READ contentHeight NOTIFY contentHeightChanged FINAL) + Q_PROPERTY(qreal availableWidth READ availableWidth NOTIFY availableWidthChanged FINAL) + Q_PROPERTY(qreal availableHeight READ availableHeight NOTIFY availableHeightChanged FINAL) Q_PROPERTY(qreal padding READ padding WRITE setPadding RESET resetPadding NOTIFY paddingChanged FINAL) Q_PROPERTY(qreal topPadding READ topPadding WRITE setTopPadding RESET resetTopPadding NOTIFY topPaddingChanged FINAL) Q_PROPERTY(qreal leftPadding READ leftPadding WRITE setLeftPadding RESET resetLeftPadding NOTIFY leftPaddingChanged FINAL) @@ -74,8 +74,8 @@ class Q_QUICKCONTROLS_EXPORT QQuickControl : public QQuickItem public: explicit QQuickControl(QQuickItem *parent = Q_NULLPTR); - qreal contentWidth() const; - qreal contentHeight() const; + qreal availableWidth() const; + qreal availableHeight() const; qreal padding() const; void setPadding(qreal padding); @@ -110,8 +110,8 @@ public: void setContentItem(QQuickItem *item); Q_SIGNALS: - void contentWidthChanged(); - void contentHeightChanged(); + void availableWidthChanged(); + void availableHeightChanged(); void paddingChanged(); void topPaddingChanged(); void leftPaddingChanged(); diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml index c0c4033c..899b3d3c 100644 --- a/src/imports/controls/Button.qml +++ b/src/imports/controls/Button.qml @@ -55,8 +55,8 @@ AbstractButton { label: Text { x: control.leftPadding y: control.topPadding - width: control.contentWidth - height: control.contentHeight + width: control.availableWidth + height: control.availableHeight text: control.text color: control.Theme.selectedTextColor diff --git a/src/imports/controls/CheckBox.qml b/src/imports/controls/CheckBox.qml index f2d6398c..9e71dda9 100644 --- a/src/imports/controls/CheckBox.qml +++ b/src/imports/controls/CheckBox.qml @@ -86,8 +86,8 @@ AbstractCheckBox { label: Text { x: control.mirrored ? control.leftPadding : (indicator.x + indicator.width + control.Theme.spacing) y: control.topPadding - width: control.contentWidth - indicator.width - control.Theme.spacing - height: control.contentHeight + width: control.availableWidth - indicator.width - control.Theme.spacing + height: control.availableHeight text: control.text color: control.enabled ? control.Theme.textColor : control.Theme.disabledColor diff --git a/src/imports/controls/GroupBox.qml b/src/imports/controls/GroupBox.qml index 6993a7f0..e3068014 100644 --- a/src/imports/controls/GroupBox.qml +++ b/src/imports/controls/GroupBox.qml @@ -57,7 +57,7 @@ AbstractGroupBox { label: Text { x: control.leftPadding - width: control.contentWidth + width: control.availableWidth text: control.title color: control.enabled ? control.Theme.textColor : control.Theme.disabledColor diff --git a/src/imports/controls/ProgressBar.qml b/src/imports/controls/ProgressBar.qml index 76f07f3c..6a6dfc11 100644 --- a/src/imports/controls/ProgressBar.qml +++ b/src/imports/controls/ProgressBar.qml @@ -53,8 +53,8 @@ AbstractProgressBar { indicator: Item { x: control.leftPadding y: control.topPadding - width: control.contentWidth - height: control.contentHeight + width: control.availableWidth + height: control.availableHeight scale: control.mirrored ? -1 : 1 @@ -95,7 +95,7 @@ AbstractProgressBar { implicitHeight: 6 x: control.leftPadding y: (parent.height - height) / 2 - width: control.contentWidth + width: control.availableWidth height: 6 radius: control.Theme.roundness diff --git a/src/imports/controls/RadioButton.qml b/src/imports/controls/RadioButton.qml index ad3b246c..106b382e 100644 --- a/src/imports/controls/RadioButton.qml +++ b/src/imports/controls/RadioButton.qml @@ -87,8 +87,8 @@ AbstractRadioButton { label: Text { x: control.mirrored ? control.leftPadding : (indicator.x + indicator.width + control.Theme.spacing) y: control.topPadding - width: control.contentWidth - indicator.width - control.Theme.spacing - height: control.contentHeight + width: control.availableWidth - indicator.width - control.Theme.spacing + height: control.availableHeight text: control.text color: control.enabled ? control.Theme.textColor : control.Theme.disabledColor diff --git a/src/imports/controls/ScrollBar.qml b/src/imports/controls/ScrollBar.qml index fe66e523..8f928d0c 100644 --- a/src/imports/controls/ScrollBar.qml +++ b/src/imports/controls/ScrollBar.qml @@ -64,8 +64,8 @@ AbstractScrollBar { readonly property bool horizontal: control.orientation === Qt.Horizontal x: control.leftPadding + (horizontal ? control.position * control.width : 0) y: control.topPadding + (horizontal ? 0 : control.position * control.height) - width: horizontal ? control.size * control.contentWidth : implicitWidth - height: horizontal ? implicitHeight : control.size * control.contentHeight + width: horizontal ? control.size * control.availableWidth : implicitWidth + height: horizontal ? implicitHeight : control.size * control.availableHeight states: State { name: "active" diff --git a/src/imports/controls/ScrollIndicator.qml b/src/imports/controls/ScrollIndicator.qml index 33c35bc7..71a50ebd 100644 --- a/src/imports/controls/ScrollIndicator.qml +++ b/src/imports/controls/ScrollIndicator.qml @@ -62,8 +62,8 @@ AbstractScrollIndicator { readonly property bool horizontal: control.orientation === Qt.Horizontal x: control.leftPadding + (horizontal ? control.position * control.width : 0) y: control.topPadding + (horizontal ? 0 : control.position * control.height) - width: horizontal ? control.size * control.contentWidth : implicitWidth - height: horizontal ? implicitHeight : control.size * control.contentHeight + width: horizontal ? control.size * control.availableWidth : implicitWidth + height: horizontal ? implicitHeight : control.size * control.availableHeight states: State { name: "active" diff --git a/src/imports/controls/Slider.qml b/src/imports/controls/Slider.qml index 32a1b90e..79792709 100644 --- a/src/imports/controls/Slider.qml +++ b/src/imports/controls/Slider.qml @@ -86,8 +86,8 @@ AbstractSlider { implicitHeight: horizontal ? 6 : 120 x: horizontal ? control.leftPadding : (control.width - width) / 2 y: horizontal ? (control.height - height) / 2 : control.topPadding - width: horizontal ? control.contentWidth : implicitWidth - height: horizontal ? implicitHeight : control.contentHeight + width: horizontal ? control.availableWidth : implicitWidth + height: horizontal ? implicitHeight : control.availableHeight radius: control.Theme.roundness border.color: control.Theme.frameColor diff --git a/src/imports/controls/Switch.qml b/src/imports/controls/Switch.qml index 7d12d14d..c1661f35 100644 --- a/src/imports/controls/Switch.qml +++ b/src/imports/controls/Switch.qml @@ -96,8 +96,8 @@ AbstractSwitch { label: Text { x: control.mirrored ? control.leftPadding : (indicator.x + indicator.width + control.Theme.spacing) y: control.topPadding - width: control.contentWidth - indicator.width - control.Theme.spacing - height: control.contentHeight + width: control.availableWidth - indicator.width - control.Theme.spacing + height: control.availableHeight text: control.text color: control.enabled ? control.Theme.textColor : control.Theme.disabledColor diff --git a/src/imports/controls/TabButton.qml b/src/imports/controls/TabButton.qml index 886260f6..05182a60 100644 --- a/src/imports/controls/TabButton.qml +++ b/src/imports/controls/TabButton.qml @@ -55,8 +55,8 @@ AbstractTabButton { label: Text { x: control.leftPadding y: control.topPadding - width: control.contentWidth - height: control.contentHeight + width: control.availableWidth + height: control.availableHeight text: control.text font.pointSize: 10 diff --git a/src/imports/controls/TextArea.qml b/src/imports/controls/TextArea.qml index 1f83c969..1bd14bc0 100644 --- a/src/imports/controls/TextArea.qml +++ b/src/imports/controls/TextArea.qml @@ -53,8 +53,8 @@ AbstractTextArea { placeholder: Text { x: control.leftPadding y: control.topPadding - width: control.width - control.leftPadding - control.rightPadding - height: control.height - control.topPadding - control.bottomPadding + width: control.availableWidth + height: control.availableHeight color: control.Theme.textColor opacity: control.Theme.disabledOpacity diff --git a/src/imports/controls/TextField.qml b/src/imports/controls/TextField.qml index a4f7c66c..7e439d05 100644 --- a/src/imports/controls/TextField.qml +++ b/src/imports/controls/TextField.qml @@ -57,8 +57,8 @@ AbstractTextField { placeholder: Text { x: control.leftPadding y: control.topPadding - width: control.width - control.leftPadding - control.rightPadding - height: control.height - control.topPadding - control.bottomPadding + width: control.availableWidth + height: control.availableHeight color: control.Theme.textColor opacity: control.Theme.disabledOpacity diff --git a/src/imports/controls/ToggleButton.qml b/src/imports/controls/ToggleButton.qml index 84d9f3df..1655a317 100644 --- a/src/imports/controls/ToggleButton.qml +++ b/src/imports/controls/ToggleButton.qml @@ -95,8 +95,8 @@ AbstractToggleButton { label: Text { x: control.mirrored ? control.leftPadding : (indicator.x + indicator.width + control.Theme.spacing) y: control.topPadding - width: control.contentWidth - indicator.width - control.Theme.spacing - height: control.contentHeight + width: control.availableWidth - indicator.width - control.Theme.spacing + height: control.availableHeight text: control.text color: control.enabled ? control.Theme.textColor : control.Theme.disabledColor diff --git a/src/imports/controls/ToolButton.qml b/src/imports/controls/ToolButton.qml index 4b9c6a5a..60e1671b 100644 --- a/src/imports/controls/ToolButton.qml +++ b/src/imports/controls/ToolButton.qml @@ -54,8 +54,8 @@ AbstractButton { label: Text { x: control.leftPadding y: control.topPadding - width: control.contentWidth - height: control.contentHeight + width: control.availableWidth + height: control.availableHeight text: control.text color: control.enabled ? control.Theme.textColor : control.Theme.disabledColor -- cgit v1.2.3