aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/controls/qquickcontainer.cpp2
-rw-r--r--src/controls/qquickcontrol.cpp40
-rw-r--r--src/controls/qquickcontrol_p.h12
-rw-r--r--src/imports/controls/Button.qml4
-rw-r--r--src/imports/controls/CheckBox.qml4
-rw-r--r--src/imports/controls/GroupBox.qml2
-rw-r--r--src/imports/controls/ProgressBar.qml6
-rw-r--r--src/imports/controls/RadioButton.qml4
-rw-r--r--src/imports/controls/ScrollBar.qml4
-rw-r--r--src/imports/controls/ScrollIndicator.qml4
-rw-r--r--src/imports/controls/Slider.qml4
-rw-r--r--src/imports/controls/Switch.qml4
-rw-r--r--src/imports/controls/TabButton.qml4
-rw-r--r--src/imports/controls/TextArea.qml4
-rw-r--r--src/imports/controls/TextField.qml4
-rw-r--r--src/imports/controls/ToggleButton.qml4
-rw-r--r--src/imports/controls/ToolButton.qml4
17 files changed, 56 insertions, 54 deletions
diff --git a/src/controls/qquickcontainer.cpp b/src/controls/qquickcontainer.cpp
index f50a5f5a..55490db1 100644
--- a/src/controls/qquickcontainer.cpp
+++ b/src/controls/qquickcontainer.cpp
@@ -57,7 +57,7 @@ void QQuickContainerPrivate::resizeContent()
Q_Q(QQuickContainer);
if (contentItem) {
contentItem->setPosition(QPointF(q->leftPadding(), q->topPadding()));
- contentItem->setSize(QSizeF(q->availableWidth(), q->availableHeight()));
+ contentItem->setSize(QSizeF(q->contentWidth(), q->contentHeight()));
}
}
diff --git a/src/controls/qquickcontrol.cpp b/src/controls/qquickcontrol.cpp
index cedfad29..dbb0d49b 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->availableHeightChanged();
+ emit q->contentHeightChanged();
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->availableWidthChanged();
+ emit q->contentWidthChanged();
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->availableWidthChanged();
+ emit q->contentWidthChanged();
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->availableHeightChanged();
+ emit q->contentHeightChanged();
q->paddingChange(QMarginsF(leftPadding, topPadding, rightPadding, bottomPadding),
QMarginsF(leftPadding, topPadding, rightPadding, oldPadding));
}
@@ -145,25 +145,27 @@ QQuickControl::QQuickControl(QQuickControlPrivate &dd, QQuickItem *parent) :
}
/*!
- \qmlproperty real QtQuickControls2::Control::availableWidth
+ \qmlproperty real QtQuickControls2::Control::contentWidth
+ \readonly
- This property holds the width available after deducting horizontal padding.
+ This property holds the content width, which equals to \c {width - leftPadding - rightPadding}.
\sa padding, leftPadding, rightPadding
*/
-qreal QQuickControl::availableWidth() const
+qreal QQuickControl::contentWidth() const
{
return width() - leftPadding() - rightPadding();
}
/*!
- \qmlproperty real QtQuickControls2::Control::availableHeight
+ \qmlproperty real QtQuickControls2::Control::contentHeight
+ \readonly
- This property holds the height available after deducting vertical padding.
+ This property holds the content height, which equals to \c {height - topPadding - bottomPadding}.
\sa padding, topPadding, bottomPadding
*/
-qreal QQuickControl::availableHeight() const
+qreal QQuickControl::contentHeight() const
{
return height() - topPadding() - bottomPadding();
}
@@ -173,7 +175,7 @@ qreal QQuickControl::availableHeight() const
This property holds the default padding.
- \sa availableWidth, availableHeight, topPadding, leftPadding, rightPadding, bottomPadding
+ \sa contentWidth, contentHeight, topPadding, leftPadding, rightPadding, bottomPadding
*/
qreal QQuickControl::padding() const
{
@@ -199,9 +201,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 availableHeightChanged();
+ emit contentHeightChanged();
if (!qFuzzyCompare(newPadding.left(), oldPadding.left()) || !qFuzzyCompare(newPadding.right(), oldPadding.right()))
- emit availableWidthChanged();
+ emit contentWidthChanged();
paddingChange(newPadding, oldPadding);
}
@@ -215,7 +217,7 @@ void QQuickControl::resetPadding()
This property holds the top padding.
- \sa padding, bottomPadding, availableHeight
+ \sa padding, bottomPadding, contentHeight
*/
qreal QQuickControl::topPadding() const
{
@@ -242,7 +244,7 @@ void QQuickControl::resetTopPadding()
This property holds the left padding.
- \sa padding, rightPadding, availableWidth
+ \sa padding, rightPadding, contentWidth
*/
qreal QQuickControl::leftPadding() const
{
@@ -269,7 +271,7 @@ void QQuickControl::resetLeftPadding()
This property holds the right padding.
- \sa padding, leftPadding, availableWidth
+ \sa padding, leftPadding, contentWidth
*/
qreal QQuickControl::rightPadding() const
{
@@ -296,7 +298,7 @@ void QQuickControl::resetRightPadding()
This property holds the bottom padding.
- \sa padding, topPadding, availableHeight
+ \sa padding, topPadding, contentHeight
*/
qreal QQuickControl::bottomPadding() const
{
@@ -423,9 +425,9 @@ void QQuickControl::geometryChanged(const QRectF &newGeometry, const QRectF &old
QQuickItem::geometryChanged(newGeometry, oldGeometry);
d->resizeBackground();
if (newGeometry.width() != oldGeometry.width())
- emit availableWidthChanged();
+ emit contentWidthChanged();
if (newGeometry.width() != oldGeometry.height())
- emit availableHeightChanged();
+ emit contentHeightChanged();
}
void QQuickControl::mirrorChange()
diff --git a/src/controls/qquickcontrol_p.h b/src/controls/qquickcontrol_p.h
index 7d74e5df..e301c3b1 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 availableWidth READ availableWidth NOTIFY availableWidthChanged)
- Q_PROPERTY(qreal availableHeight READ availableHeight NOTIFY availableHeightChanged)
+ Q_PROPERTY(qreal contentWidth READ contentWidth NOTIFY contentWidthChanged FINAL)
+ Q_PROPERTY(qreal contentHeight READ contentHeight NOTIFY contentHeightChanged 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)
@@ -73,8 +73,8 @@ class Q_QUICKCONTROLS_EXPORT QQuickControl : public QQuickItem
public:
explicit QQuickControl(QQuickItem *parent = Q_NULLPTR);
- qreal availableWidth() const;
- qreal availableHeight() const;
+ qreal contentWidth() const;
+ qreal contentHeight() const;
qreal padding() const;
void setPadding(qreal padding);
@@ -106,8 +106,8 @@ public:
void setBackground(QQuickItem *background);
Q_SIGNALS:
- void availableWidthChanged();
- void availableHeightChanged();
+ void contentWidthChanged();
+ void contentHeightChanged();
void paddingChanged();
void topPaddingChanged();
void leftPaddingChanged();
diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml
index 899b3d3c..c0c4033c 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.availableWidth
- height: control.availableHeight
+ width: control.contentWidth
+ height: control.contentHeight
text: control.text
color: control.Theme.selectedTextColor
diff --git a/src/imports/controls/CheckBox.qml b/src/imports/controls/CheckBox.qml
index 9e71dda9..f2d6398c 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.availableWidth - indicator.width - control.Theme.spacing
- height: control.availableHeight
+ width: control.contentWidth - indicator.width - control.Theme.spacing
+ height: control.contentHeight
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 e3068014..6993a7f0 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.availableWidth
+ width: control.contentWidth
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 6a6dfc11..76f07f3c 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.availableWidth
- height: control.availableHeight
+ width: control.contentWidth
+ height: control.contentHeight
scale: control.mirrored ? -1 : 1
@@ -95,7 +95,7 @@ AbstractProgressBar {
implicitHeight: 6
x: control.leftPadding
y: (parent.height - height) / 2
- width: control.availableWidth
+ width: control.contentWidth
height: 6
radius: control.Theme.roundness
diff --git a/src/imports/controls/RadioButton.qml b/src/imports/controls/RadioButton.qml
index 106b382e..ad3b246c 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.availableWidth - indicator.width - control.Theme.spacing
- height: control.availableHeight
+ width: control.contentWidth - indicator.width - control.Theme.spacing
+ height: control.contentHeight
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 8f928d0c..fe66e523 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.availableWidth : implicitWidth
- height: horizontal ? implicitHeight : control.size * control.availableHeight
+ width: horizontal ? control.size * control.contentWidth : implicitWidth
+ height: horizontal ? implicitHeight : control.size * control.contentHeight
states: State {
name: "active"
diff --git a/src/imports/controls/ScrollIndicator.qml b/src/imports/controls/ScrollIndicator.qml
index 71a50ebd..33c35bc7 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.availableWidth : implicitWidth
- height: horizontal ? implicitHeight : control.size * control.availableHeight
+ width: horizontal ? control.size * control.contentWidth : implicitWidth
+ height: horizontal ? implicitHeight : control.size * control.contentHeight
states: State {
name: "active"
diff --git a/src/imports/controls/Slider.qml b/src/imports/controls/Slider.qml
index 79792709..32a1b90e 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.availableWidth : implicitWidth
- height: horizontal ? implicitHeight : control.availableHeight
+ width: horizontal ? control.contentWidth : implicitWidth
+ height: horizontal ? implicitHeight : control.contentHeight
radius: control.Theme.roundness
border.color: control.Theme.frameColor
diff --git a/src/imports/controls/Switch.qml b/src/imports/controls/Switch.qml
index c1661f35..7d12d14d 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.availableWidth - indicator.width - control.Theme.spacing
- height: control.availableHeight
+ width: control.contentWidth - indicator.width - control.Theme.spacing
+ height: control.contentHeight
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 05182a60..886260f6 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.availableWidth
- height: control.availableHeight
+ width: control.contentWidth
+ height: control.contentHeight
text: control.text
font.pointSize: 10
diff --git a/src/imports/controls/TextArea.qml b/src/imports/controls/TextArea.qml
index 1bd14bc0..d63a4cf0 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.availableWidth
- height: control.availableHeight
+ width: control.contentWidth
+ height: control.contentHeight
color: control.Theme.textColor
opacity: control.Theme.disabledOpacity
diff --git a/src/imports/controls/TextField.qml b/src/imports/controls/TextField.qml
index cf00f110..23c0868d 100644
--- a/src/imports/controls/TextField.qml
+++ b/src/imports/controls/TextField.qml
@@ -56,8 +56,8 @@ AbstractTextField {
placeholder: Text {
x: control.leftPadding
y: control.topPadding
- width: control.availableWidth
- height: control.availableHeight
+ width: control.contentWidth
+ height: control.contentHeight
color: control.Theme.textColor
opacity: control.Theme.disabledOpacity
diff --git a/src/imports/controls/ToggleButton.qml b/src/imports/controls/ToggleButton.qml
index 1655a317..84d9f3df 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.availableWidth - indicator.width - control.Theme.spacing
- height: control.availableHeight
+ width: control.contentWidth - indicator.width - control.Theme.spacing
+ height: control.contentHeight
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 60e1671b..4b9c6a5a 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.availableWidth
- height: control.availableHeight
+ width: control.contentWidth
+ height: control.contentHeight
text: control.text
color: control.enabled ? control.Theme.textColor : control.Theme.disabledColor