aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/imports/calendar/CalendarView.qml4
-rw-r--r--src/imports/calendar/DayOfWeekRow.qml4
-rw-r--r--src/imports/calendar/WeekNumberColumn.qml4
-rw-r--r--src/imports/controls/CheckBox.qml4
-rw-r--r--src/imports/controls/Frame.qml4
-rw-r--r--src/imports/controls/GroupBox.qml6
-rw-r--r--src/imports/controls/PageIndicator.qml4
-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/TabBar.qml4
-rw-r--r--src/imports/controls/TabButton.qml4
-rw-r--r--src/imports/controls/TabView.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/ToolBar.qml4
-rw-r--r--src/imports/controls/ToolButton.qml4
21 files changed, 44 insertions, 44 deletions
diff --git a/src/imports/calendar/CalendarView.qml b/src/imports/calendar/CalendarView.qml
index f70f063b..6d182b49 100644
--- a/src/imports/calendar/CalendarView.qml
+++ b/src/imports/calendar/CalendarView.qml
@@ -66,8 +66,8 @@ AbstractCalendarView {
x: control.leftPadding
y: control.topPadding
- width: parent.width - control.leftPadding - control.rightPadding
- height: parent.height - control.topPadding - control.bottomPadding
+ width: control.availableWidth
+ height: control.availableHeight
Repeater {
id: repeater
diff --git a/src/imports/calendar/DayOfWeekRow.qml b/src/imports/calendar/DayOfWeekRow.qml
index b6404c05..c92b76bc 100644
--- a/src/imports/calendar/DayOfWeekRow.qml
+++ b/src/imports/calendar/DayOfWeekRow.qml
@@ -65,8 +65,8 @@ AbstractDayOfWeekRow {
x: control.leftPadding
y: control.topPadding
- width: parent.width - control.leftPadding - control.rightPadding
- height: parent.height - control.topPadding - control.bottomPadding
+ width: control.availableWidth
+ height: control.availableHeight
Repeater {
model: control.source
diff --git a/src/imports/calendar/WeekNumberColumn.qml b/src/imports/calendar/WeekNumberColumn.qml
index 3d3092fe..2dbde919 100644
--- a/src/imports/calendar/WeekNumberColumn.qml
+++ b/src/imports/calendar/WeekNumberColumn.qml
@@ -65,8 +65,8 @@ AbstractWeekNumberColumn {
x: control.leftPadding
y: control.topPadding
- width: parent.width - control.leftPadding - control.rightPadding
- height: parent.height - control.topPadding - control.bottomPadding
+ width: control.availableWidth
+ height: control.availableHeight
Repeater {
model: control.source
diff --git a/src/imports/controls/CheckBox.qml b/src/imports/controls/CheckBox.qml
index e16eb73a..c250b54a 100644
--- a/src/imports/controls/CheckBox.qml
+++ b/src/imports/controls/CheckBox.qml
@@ -83,8 +83,8 @@ AbstractCheckBox {
label: Text {
x: control.mirrored ? control.leftPadding : (indicator.x + indicator.width + control.Theme.spacing)
y: control.topPadding
- width: parent.width - indicator.width - control.Theme.spacing - control.leftPadding - control.rightPadding
- height: parent.height - control.topPadding - control.bottomPadding
+ 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/Frame.qml b/src/imports/controls/Frame.qml
index dc773e95..01bb0e53 100644
--- a/src/imports/controls/Frame.qml
+++ b/src/imports/controls/Frame.qml
@@ -56,8 +56,8 @@ AbstractFrame {
id: content
x: control.leftPadding
y: control.topPadding
- width: parent.width - control.leftPadding - control.rightPadding
- height: parent.height - control.topPadding - control.bottomPadding
+ width: control.availableWidth
+ height: control.availableHeight
}
background: Rectangle {
diff --git a/src/imports/controls/GroupBox.qml b/src/imports/controls/GroupBox.qml
index 21bc6417..d4ae204e 100644
--- a/src/imports/controls/GroupBox.qml
+++ b/src/imports/controls/GroupBox.qml
@@ -57,13 +57,13 @@ AbstractGroupBox {
id: content
x: control.leftPadding
y: control.topPadding
- width: parent.width - control.leftPadding - control.rightPadding
- height: parent.height - control.topPadding - control.bottomPadding
+ width: control.availableWidth
+ height: control.availableHeight
}
label: Text {
x: control.leftPadding
- width: parent.width - control.leftPadding - control.rightPadding
+ width: control.availableWidth
text: control.title
color: control.enabled ? control.Theme.textColor : control.Theme.disabledColor
diff --git a/src/imports/controls/PageIndicator.qml b/src/imports/controls/PageIndicator.qml
index c656aca9..cea0a050 100644
--- a/src/imports/controls/PageIndicator.qml
+++ b/src/imports/controls/PageIndicator.qml
@@ -68,8 +68,8 @@ AbstractPageIndicator {
x: control.leftPadding
y: control.topPadding
- width: parent.width - control.leftPadding - control.rightPadding
- height: parent.height - control.topPadding - control.bottomPadding
+ width: control.availableWidth
+ height: control.availableHeight
spacing: control.Theme.spacing
diff --git a/src/imports/controls/ProgressBar.qml b/src/imports/controls/ProgressBar.qml
index cd4b4213..ec067737 100644
--- a/src/imports/controls/ProgressBar.qml
+++ b/src/imports/controls/ProgressBar.qml
@@ -52,8 +52,8 @@ AbstractProgressBar {
indicator: Item {
x: control.leftPadding
y: control.topPadding
- width: parent.width - control.leftPadding - control.rightPadding
- height: parent.height - control.topPadding - control.bottomPadding
+ width: control.availableWidth
+ height: control.availableHeight
scale: control.mirrored ? -1 : 1
@@ -92,7 +92,7 @@ AbstractProgressBar {
implicitHeight: 6
x: control.leftPadding
y: (parent.height - height) / 2
- width: parent.width - control.leftPadding - control.rightPadding
+ width: control.availableWidth
height: 6
radius: control.Theme.roundness
diff --git a/src/imports/controls/RadioButton.qml b/src/imports/controls/RadioButton.qml
index 74fea92e..31c198ac 100644
--- a/src/imports/controls/RadioButton.qml
+++ b/src/imports/controls/RadioButton.qml
@@ -84,8 +84,8 @@ AbstractRadioButton {
label: Text {
x: control.mirrored ? control.leftPadding : (indicator.x + indicator.width + control.Theme.spacing)
y: control.topPadding
- width: parent.width - indicator.width - control.Theme.spacing - control.leftPadding - control.rightPadding
- height: parent.height - control.topPadding - control.bottomPadding
+ 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 a9302231..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.width - control.leftPadding - control.rightPadding : implicitWidth
- height: horizontal ? implicitHeight : control.size * control.height - control.topPadding - control.bottomPadding
+ 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 9a525f51..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.width - control.leftPadding - control.rightPadding : implicitWidth
- height: horizontal ? implicitHeight : control.size * control.height - control.topPadding - control.bottomPadding
+ 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 850791e0..cf9cecd3 100644
--- a/src/imports/controls/Slider.qml
+++ b/src/imports/controls/Slider.qml
@@ -83,8 +83,8 @@ AbstractSlider {
implicitHeight: horizontal ? 6 : 120
x: horizontal ? control.leftPadding : (control.width - width) / 2
y: horizontal ? (control.height - height) / 2 : control.topPadding
- width: horizontal ? parent.width - control.leftPadding - control.rightPadding : implicitWidth
- height: horizontal ? implicitHeight : parent.height - control.topPadding - control.bottomPadding
+ 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 6bc8a02d..97c1bd5c 100644
--- a/src/imports/controls/Switch.qml
+++ b/src/imports/controls/Switch.qml
@@ -93,8 +93,8 @@ AbstractSwitch {
label: Text {
x: control.mirrored ? control.leftPadding : (indicator.x + indicator.width + control.Theme.spacing)
y: control.topPadding
- width: parent.width - indicator.width - control.Theme.spacing - control.leftPadding - control.rightPadding
- height: parent.height - control.topPadding - control.bottomPadding
+ 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/TabBar.qml b/src/imports/controls/TabBar.qml
index 28757b0d..88ef7031 100644
--- a/src/imports/controls/TabBar.qml
+++ b/src/imports/controls/TabBar.qml
@@ -66,8 +66,8 @@ AbstractTabBar {
x: control.leftPadding
y: control.topPadding
- width: parent.width - control.leftPadding - control.rightPadding
- height: parent.height - control.topPadding - control.bottomPadding
+ width: control.availableWidth
+ height: control.availableHeight
spacing: 1
orientation: ListView.Horizontal
diff --git a/src/imports/controls/TabButton.qml b/src/imports/controls/TabButton.qml
index 8c658867..cb1bf652 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: parent.width - control.leftPadding - control.rightPadding
- height: parent.height - control.topPadding - control.bottomPadding
+ width: control.availableWidth
+ height: control.availableHeight
text: control.text
font.pointSize: 10
diff --git a/src/imports/controls/TabView.qml b/src/imports/controls/TabView.qml
index 19c75691..63327d29 100644
--- a/src/imports/controls/TabView.qml
+++ b/src/imports/controls/TabView.qml
@@ -70,8 +70,8 @@ AbstractTabView {
x: control.leftPadding
y: control.topPadding
- width: parent.width - control.leftPadding - control.rightPadding
- height: parent.height - control.topPadding - control.bottomPadding
+ width: control.availableWidth
+ height: control.availableHeight
orientation: Qt.Horizontal
snapMode: ListView.SnapOneItem
diff --git a/src/imports/controls/TextArea.qml b/src/imports/controls/TextArea.qml
index f415944c..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: parent.width - control.leftPadding - control.rightPadding
- height: parent.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 6058e6aa..cf00f110 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: parent.width - control.leftPadding - control.rightPadding
- height: parent.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 185f2eee..9e11fb39 100644
--- a/src/imports/controls/ToggleButton.qml
+++ b/src/imports/controls/ToggleButton.qml
@@ -92,8 +92,8 @@ AbstractToggleButton {
label: Text {
x: control.mirrored ? control.leftPadding : (indicator.x + indicator.width + control.Theme.spacing)
y: control.topPadding
- width: parent.width - indicator.width - control.Theme.spacing - control.leftPadding - control.rightPadding
- height: parent.height - control.topPadding - control.bottomPadding
+ 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/ToolBar.qml b/src/imports/controls/ToolBar.qml
index 2d893264..0ec2b4c0 100644
--- a/src/imports/controls/ToolBar.qml
+++ b/src/imports/controls/ToolBar.qml
@@ -56,8 +56,8 @@ AbstractToolBar {
id: content
x: control.leftPadding
y: control.topPadding
- width: parent.width - control.leftPadding - control.rightPadding
- height: parent.height - control.topPadding - control.bottomPadding
+ width: control.availableWidth
+ height: control.availableHeight
}
background: Rectangle {
diff --git a/src/imports/controls/ToolButton.qml b/src/imports/controls/ToolButton.qml
index 38327966..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: parent.width - control.leftPadding - control.rightPadding
- height: parent.height - control.topPadding - control.bottomPadding
+ width: control.availableWidth
+ height: control.availableHeight
text: control.text
color: control.enabled ? control.Theme.textColor : control.Theme.disabledColor