From 6941b934bdf5f3c7b65f682c8dfc5c6562292351 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Mon, 15 Jun 2015 00:06:05 +0200 Subject: Rename Control::availableWidth/Height to contentWidth/Height Change-Id: Ia39a52e7e8d968b05fd7a2d64ab3b3030a9f528e Reviewed-by: J-P Nurmi --- 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 ++-- 14 files changed, 28 insertions(+), 28 deletions(-) (limited to 'src/imports/controls') 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 -- cgit v1.2.3