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 <jpnurmi@theqtcompany.com>

14 files changed, 28 insertions, 28 deletions

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