diff options
Diffstat (limited to 'src')
23 files changed, 222 insertions, 176 deletions
diff --git a/src/imports/calendar/CalendarView.qml b/src/imports/calendar/CalendarView.qml index ce6e9908..f1a6f598 100644 --- a/src/imports/calendar/CalendarView.qml +++ b/src/imports/calendar/CalendarView.qml @@ -53,8 +53,8 @@ AbstractCalendarView { contentWidth: grid.implicitWidth contentHeight: grid.implicitHeight - implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + padding.left + padding.right) - implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + padding.top + padding.bottom) + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) Accessible.name: title @@ -64,10 +64,10 @@ AbstractCalendarView { rows: 6 columns: 7 - x: padding.left - y: padding.top - width: parent.width - padding.left - padding.right - height: parent.height - padding.top - padding.bottom + x: control.leftPadding + y: control.topPadding + width: parent.width - control.leftPadding - control.rightPadding + height: parent.height - control.topPadding - control.bottomPadding Repeater { id: repeater diff --git a/src/imports/calendar/DayOfWeekRow.qml b/src/imports/calendar/DayOfWeekRow.qml index 5a33b5ee..71c47f8e 100644 --- a/src/imports/calendar/DayOfWeekRow.qml +++ b/src/imports/calendar/DayOfWeekRow.qml @@ -54,18 +54,19 @@ AbstractDayOfWeekRow { contentWidth: row.implicitWidth contentHeight: row.implicitHeight - implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + padding.left + padding.right) - implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + padding.top + padding.bottom) + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) - padding { top: style.padding; bottom: style.padding } + topPadding: style.padding + bottomPadding: style.padding contentItem: Row { id: row - x: padding.left - y: padding.top - width: parent.width - padding.left - padding.right - height: parent.height - padding.top - padding.bottom + x: control.leftPadding + y: control.topPadding + width: parent.width - control.leftPadding - control.rightPadding + height: parent.height - control.topPadding - control.bottomPadding Repeater { model: control.source diff --git a/src/imports/calendar/WeekNumberColumn.qml b/src/imports/calendar/WeekNumberColumn.qml index e2d1f63c..fe165090 100644 --- a/src/imports/calendar/WeekNumberColumn.qml +++ b/src/imports/calendar/WeekNumberColumn.qml @@ -54,18 +54,19 @@ AbstractWeekNumberColumn { contentWidth: column.implicitWidth contentHeight: column.implicitHeight - implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + padding.left + padding.right) - implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + padding.top + padding.bottom) + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) - padding { left: style.padding; right: style.padding } + leftPadding: style.padding + rightPadding: style.padding contentItem: Column { id: column - x: padding.left - y: padding.top - width: parent.width - padding.left - padding.right - height: parent.height - padding.top - padding.bottom + x: control.leftPadding + y: control.topPadding + width: parent.width - control.leftPadding - control.rightPadding + height: parent.height - control.topPadding - control.bottomPadding Repeater { model: control.source diff --git a/src/imports/controls/BusyIndicator.qml b/src/imports/controls/BusyIndicator.qml index 09abd9dc..f13b579f 100644 --- a/src/imports/controls/BusyIndicator.qml +++ b/src/imports/controls/BusyIndicator.qml @@ -40,12 +40,15 @@ import QtQuick.Controls 2.0 AbstractBusyIndicator { id: control - implicitWidth: indicator.implicitWidth + padding.left + padding.right - implicitHeight: indicator.implicitHeight + padding.top + padding.bottom + implicitWidth: indicator.implicitWidth + leftPadding + rightPadding + implicitHeight: indicator.implicitHeight + topPadding + bottomPadding Accessible.role: Accessible.Indicator - padding { top: style.padding; left: style.padding; right: style.padding; bottom: style.padding } + topPadding: style.padding + leftPadding: style.padding + rightPadding: style.padding + bottomPadding: style.padding indicator: Item { id: delegate diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml index 8ec7065b..f77e5685 100644 --- a/src/imports/controls/Button.qml +++ b/src/imports/controls/Button.qml @@ -41,21 +41,24 @@ AbstractButton { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, - label ? label.implicitWidth + padding.left + padding.right : 0) + label ? label.implicitWidth + leftPadding + rightPadding : 0) implicitHeight: Math.max(background ? background.implicitHeight : 0, - label ? label.implicitHeight + padding.top + padding.bottom : 0) + label ? label.implicitHeight + topPadding + bottomPadding : 0) Accessible.name: text Accessible.pressed: pressed Accessible.role: Accessible.Button - padding { top: style.padding; left: style.padding; right: style.padding; bottom: style.padding } + topPadding: style.padding + leftPadding: style.padding + rightPadding: style.padding + bottomPadding: style.padding label: Text { - x: padding.left - y: padding.top - width: parent.width - padding.left - padding.right - height: parent.height - padding.top - padding.bottom + x: control.leftPadding + y: control.topPadding + width: parent.width - control.leftPadding - control.rightPadding + height: parent.height - control.topPadding - control.bottomPadding text: control.text color: control.style.selectedTextColor diff --git a/src/imports/controls/CheckBox.qml b/src/imports/controls/CheckBox.qml index 6bc8f473..b100fcb5 100644 --- a/src/imports/controls/CheckBox.qml +++ b/src/imports/controls/CheckBox.qml @@ -43,24 +43,27 @@ AbstractCheckBox { implicitWidth: Math.max(background ? background.implicitWidth : 0, (label ? label.implicitWidth : 0) + (indicator ? indicator.implicitWidth : 0) + - (label && indicator ? style.spacing : 0) + padding.left + padding.right) + (label && indicator ? style.spacing : 0) + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, Math.max(label ? label.implicitHeight : 0, - indicator ? indicator.implicitHeight : 0) + padding.top + padding.bottom) + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) Accessible.name: text Accessible.checked: checked Accessible.pressed: pressed Accessible.role: Accessible.CheckBox - padding { top: style.padding; left: style.padding; right: style.padding; bottom: style.padding } + topPadding: style.padding + leftPadding: style.padding + rightPadding: style.padding + bottomPadding: style.padding indicator: Rectangle { readonly property bool mirror: control.effectiveLayoutDirection == Qt.RightToLeft implicitWidth: 20 implicitHeight: 20 - x: text ? (mirror ? parent.width - width - padding.right : padding.left) : (parent.width - width) / 2 + x: text ? (mirror ? parent.width - width - control.rightPadding : control.leftPadding) : (parent.width - width) / 2 y: (parent.height - height) / 2 radius: style.roundness @@ -85,10 +88,10 @@ AbstractCheckBox { label: Text { readonly property bool mirror: control.effectiveLayoutDirection == Qt.RightToLeft - x: mirror ? padding.left : (indicator.x + indicator.width + control.style.spacing) - y: padding.top - width: parent.width - indicator.width - control.style.spacing - padding.left - padding.right - height: parent.height - padding.top - padding.bottom + x: mirror ? control.leftPadding : (indicator.x + indicator.width + control.style.spacing) + y: control.topPadding + width: parent.width - indicator.width - control.style.spacing - control.leftPadding - control.rightPadding + height: parent.height - control.topPadding - control.bottomPadding text: control.text color: control.style.textColor diff --git a/src/imports/controls/Frame.qml b/src/imports/controls/Frame.qml index 62582263..766e5e30 100644 --- a/src/imports/controls/Frame.qml +++ b/src/imports/controls/Frame.qml @@ -43,21 +43,24 @@ AbstractFrame { default property alias data: content.data implicitWidth: Math.max(background ? background.implicitWidth : 0, - contentWidth + padding.left + padding.right) + contentWidth + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, - contentHeight + padding.top + padding.bottom) + contentHeight + topPadding + bottomPadding) contentWidth: content.children.length === 1 ? content.children[0].implicitWidth : 0 contentHeight: content.children.length === 1 ? content.children[0].implicitHeight : 0 - padding { top: style.padding; left: style.padding; right: style.padding; bottom: style.padding } + topPadding: style.padding + leftPadding: style.padding + rightPadding: style.padding + bottomPadding: style.padding contentItem: Item { id: content - x: padding.left - y: padding.top - width: parent.width - padding.left - padding.right - height: parent.height - padding.top - padding.bottom + x: control.leftPadding + y: control.topPadding + width: parent.width - control.leftPadding - control.rightPadding + height: parent.height - control.topPadding - control.bottomPadding } background: Rectangle { diff --git a/src/imports/controls/GroupBox.qml b/src/imports/controls/GroupBox.qml index 39e45adb..2e278e3a 100644 --- a/src/imports/controls/GroupBox.qml +++ b/src/imports/controls/GroupBox.qml @@ -43,31 +43,29 @@ AbstractGroupBox { default property alias data: content.data implicitWidth: Math.max(background ? background.implicitWidth : 0, - contentWidth + padding.left + padding.right) + contentWidth + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, - contentHeight + padding.top + padding.bottom) + contentHeight + topPadding + bottomPadding) contentWidth: content.children.length === 1 ? content.children[0].implicitWidth : 0 contentHeight: content.children.length === 1 ? content.children[0].implicitHeight : 0 - padding { - top: style.padding + (label && title ? label.implicitHeight + style.spacing : 0) - left: style.padding - right: style.padding - bottom: style.padding - } + topPadding: style.padding + (label && title ? label.implicitHeight + style.spacing : 0) + leftPadding: style.padding + rightPadding: style.padding + bottomPadding: style.padding contentItem: Item { id: content - x: padding.left - y: padding.top - width: parent.width - padding.left - padding.right - height: parent.height - padding.top - padding.bottom + x: control.leftPadding + y: control.topPadding + width: parent.width - control.leftPadding - control.rightPadding + height: parent.height - control.topPadding - control.bottomPadding } label: Text { - x: padding.left - width: parent.width - padding.left - padding.right + x: control.leftPadding + width: parent.width - control.leftPadding - control.rightPadding text: control.title color: control.style.textColor @@ -78,9 +76,9 @@ AbstractGroupBox { } frame: Rectangle { - y: padding.top - style.padding + y: control.topPadding - style.padding width: parent.width - height: parent.height - padding.top + style.padding + height: parent.height - control.topPadding + style.padding color: "transparent" radius: style.roundness diff --git a/src/imports/controls/PageIndicator.qml b/src/imports/controls/PageIndicator.qml index db6dbdde..23a4a28d 100644 --- a/src/imports/controls/PageIndicator.qml +++ b/src/imports/controls/PageIndicator.qml @@ -58,18 +58,21 @@ AbstractPageIndicator { contentWidth: row.implicitWidth contentHeight: row.implicitHeight - implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + padding.left + padding.right) - implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + padding.top + padding.bottom) + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) - padding { top: style.padding; left: style.padding; right: style.padding; bottom: style.padding } + topPadding: style.padding + leftPadding: style.padding + rightPadding: style.padding + bottomPadding: style.padding contentItem: Row { id: row - x: padding.left - y: padding.top - width: parent.width - padding.left - padding.right - height: parent.height - padding.top - padding.bottom + x: control.leftPadding + y: control.topPadding + width: parent.width - control.leftPadding - control.rightPadding + height: parent.height - control.topPadding - control.bottomPadding spacing: style.spacing diff --git a/src/imports/controls/ProgressBar.qml b/src/imports/controls/ProgressBar.qml index 8e6342ee..bb3ac3a3 100644 --- a/src/imports/controls/ProgressBar.qml +++ b/src/imports/controls/ProgressBar.qml @@ -41,19 +41,23 @@ AbstractProgressBar { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, - indicator ? indicator.implicitWidth : 0) + padding.left + padding.right + indicator ? indicator.implicitWidth : 0) + leftPadding + rightPadding implicitHeight: Math.max(background ? background.implicitHeight : 0, - indicator ? indicator.implicitHeight : 0) + padding.top + padding.bottom + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding Accessible.role: Accessible.ProgressBar - padding { top: style.padding; left: style.padding; right: style.padding; bottom: style.padding } + topPadding: style.padding + leftPadding: style.padding + rightPadding: style.padding + bottomPadding: style.padding indicator: Item { - x: padding.left - y: padding.top - width: parent.width - padding.left - padding.right - height: parent.height - padding.top - padding.bottom + x: control.leftPadding + y: control.topPadding + width: parent.width - control.leftPadding - control.rightPadding + height: parent.height - control.topPadding - control.bottomPadding + scale: control.effectiveLayoutDirection === Qt.RightToLeft ? -1 : 1 Repeater { @@ -89,9 +93,9 @@ AbstractProgressBar { background: Rectangle { implicitWidth: 120 implicitHeight: 6 - x: padding.left + x: control.leftPadding y: (parent.height - height) / 2 - width: parent.width - padding.left - padding.bottom + width: parent.width - control.leftPadding - control.rightPadding height: 6 radius: style.roundness diff --git a/src/imports/controls/RadioButton.qml b/src/imports/controls/RadioButton.qml index 919ab947..82ecc10c 100644 --- a/src/imports/controls/RadioButton.qml +++ b/src/imports/controls/RadioButton.qml @@ -43,24 +43,27 @@ AbstractRadioButton { implicitWidth: Math.max(background ? background.implicitWidth : 0, (label ? label.implicitWidth : 0) + (indicator ? indicator.implicitWidth : 0) + - (label && indicator ? style.spacing : 0) + padding.left + padding.right) + (label && indicator ? style.spacing : 0) + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, Math.max(label ? label.implicitHeight : 0, - indicator ? indicator.implicitHeight : 0) + padding.top + padding.bottom) + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) Accessible.name: text Accessible.checked: checked Accessible.pressed: pressed Accessible.role: Accessible.RadioButton - padding { top: style.padding; left: style.padding; right: style.padding; bottom: style.padding } + topPadding: style.padding + leftPadding: style.padding + rightPadding: style.padding + bottomPadding: style.padding indicator: Rectangle { readonly property bool mirror: control.effectiveLayoutDirection == Qt.RightToLeft implicitWidth: 20 implicitHeight: 20 - x: text ? (mirror ? parent.width - width - padding.right : padding.left) : (parent.width - width) / 2 + x: text ? (mirror ? parent.width - width - control.rightPadding : control.leftPadding) : (parent.width - width) / 2 y: (parent.height - height) / 2 radius: width / 2 @@ -86,10 +89,10 @@ AbstractRadioButton { label: Text { readonly property bool mirror: control.effectiveLayoutDirection == Qt.RightToLeft - x: mirror ? padding.left : (indicator.x + indicator.width + control.style.spacing) - y: padding.top - width: parent.width - indicator.width - control.style.spacing - padding.left - padding.right - height: parent.height - padding.top - padding.bottom + x: mirror ? control.leftPadding : (indicator.x + indicator.width + control.style.spacing) + y: control.topPadding + width: parent.width - indicator.width - control.style.spacing - control.leftPadding - control.rightPadding + height: parent.height - control.topPadding - control.bottomPadding text: control.text color: control.style.textColor diff --git a/src/imports/controls/ScrollBar.qml b/src/imports/controls/ScrollBar.qml index 83e8ac6b..e14b64ff 100644 --- a/src/imports/controls/ScrollBar.qml +++ b/src/imports/controls/ScrollBar.qml @@ -41,14 +41,17 @@ AbstractScrollBar { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, - handle.implicitWidth + padding.left + padding.right) + handle.implicitWidth + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, - handle.implicitHeight + padding.top + padding.bottom) + handle.implicitHeight + topPadding + bottomPadding) Accessible.pressed: pressed Accessible.role: Accessible.ScrollBar - padding { top: 2; left: 2; right: 2; bottom: 2 } + topPadding: 2 + leftPadding: 2 + rightPadding: 2 + bottomPadding: 2 handle: Rectangle { id: handle @@ -62,10 +65,10 @@ AbstractScrollBar { opacity: 0.0 readonly property bool horizontal: control.orientation === Qt.Horizontal - x: padding.left + (horizontal ? control.position * control.width : 0) - y: padding.top + (horizontal ? 0 : control.position * control.height) - width: horizontal ? control.size * control.width - padding.left - padding.right : implicitWidth - height: horizontal ? implicitHeight : control.size * control.height - padding.top - padding.bottom + 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 states: State { name: "active" diff --git a/src/imports/controls/ScrollIndicator.qml b/src/imports/controls/ScrollIndicator.qml index 7a4bbba6..0b361e87 100644 --- a/src/imports/controls/ScrollIndicator.qml +++ b/src/imports/controls/ScrollIndicator.qml @@ -41,13 +41,16 @@ AbstractScrollIndicator { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, - indicator.implicitWidth + padding.left + padding.right) + indicator.implicitWidth + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, - indicator.implicitHeight + padding.top + padding.bottom) + indicator.implicitHeight + topPadding + bottomPadding) Accessible.role: Accessible.Indicator - padding { top: 2; left: 2; right: 2; bottom: 2 } + topPadding: 2 + leftPadding: 2 + rightPadding: 2 + bottomPadding: 2 indicator: Rectangle { id: indicator @@ -60,10 +63,10 @@ AbstractScrollIndicator { opacity: 0.0 readonly property bool horizontal: control.orientation === Qt.Horizontal - x: padding.left + (horizontal ? control.position * control.width : 0) - y: padding.top + (horizontal ? 0 : control.position * control.height) - width: horizontal ? control.size * control.width - padding.left - padding.right : implicitWidth - height: horizontal ? implicitHeight : control.size * control.height - padding.top - padding.bottom + 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 states: State { name: "active" diff --git a/src/imports/controls/Slider.qml b/src/imports/controls/Slider.qml index fc6abc60..82eac87e 100644 --- a/src/imports/controls/Slider.qml +++ b/src/imports/controls/Slider.qml @@ -42,15 +42,18 @@ AbstractSlider { implicitWidth: Math.max(background ? background.implicitWidth : 0, Math.max(track ? track.implicitWidth : 0, - handle ? handle.implicitWidth : 0) + padding.left + padding.right) + handle ? handle.implicitWidth : 0) + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, Math.max(track ? track.implicitHeight : 0, - handle ? handle.implicitHeight : 0) + padding.top + padding.bottom) + handle ? handle.implicitHeight : 0) + topPadding + bottomPadding) Accessible.pressed: pressed Accessible.role: Accessible.Slider - padding { top: style.padding; left: style.padding; right: style.padding; bottom: style.padding } + topPadding: style.padding + leftPadding: style.padding + rightPadding: style.padding + bottomPadding: style.padding handle: Rectangle { implicitWidth: 20 @@ -81,10 +84,10 @@ AbstractSlider { readonly property bool horizontal: control.orientation === Qt.Horizontal implicitWidth: horizontal ? 120 : 6 implicitHeight: horizontal ? 6 : 120 - x: horizontal ? padding.left : (control.width - width) / 2 - y: horizontal ? (control.height - height) / 2 : padding.top - width: horizontal ? parent.width - padding.left - padding.right : implicitWidth - height: horizontal ? implicitHeight : parent.height - padding.top - padding.bottom + 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 radius: style.roundness border.color: style.frameColor diff --git a/src/imports/controls/Switch.qml b/src/imports/controls/Switch.qml index 51768cc6..4ce9801d 100644 --- a/src/imports/controls/Switch.qml +++ b/src/imports/controls/Switch.qml @@ -43,10 +43,10 @@ AbstractSwitch { implicitWidth: Math.max(background ? background.implicitWidth : 0, (label ? label.implicitWidth : 0) + (indicator ? indicator.implicitWidth : 0) + - (label && indicator ? style.spacing : 0) + padding.left + padding.right) + (label && indicator ? style.spacing : 0) + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, Math.max(label ? label.implicitHeight : 0, - indicator ? indicator.implicitHeight : 0) + padding.top + padding.bottom) + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) Accessible.name: text Accessible.checkable: true @@ -54,14 +54,17 @@ AbstractSwitch { Accessible.pressed: pressed Accessible.role: Accessible.Button // TODO: Switch? - padding { top: style.padding; left: style.padding; right: style.padding; bottom: style.padding } + topPadding: style.padding + leftPadding: style.padding + rightPadding: style.padding + bottomPadding: style.padding indicator: Rectangle { readonly property bool mirror: control.effectiveLayoutDirection == Qt.RightToLeft implicitWidth: 36 implicitHeight: 20 - x: text ? (mirror ? parent.width - width - padding.right : padding.left) : (parent.width - width) / 2 + x: text ? (mirror ? parent.width - width - control.rightPadding : control.leftPadding) : (parent.width - width) / 2 y: (parent.height - height) / 2 radius: 10 @@ -95,10 +98,10 @@ AbstractSwitch { label: Text { readonly property bool mirror: control.effectiveLayoutDirection == Qt.RightToLeft - x: mirror ? padding.left : (indicator.x + indicator.width + control.style.spacing) - y: padding.top - width: parent.width - indicator.width - control.style.spacing - padding.left - padding.right - height: parent.height - padding.top - padding.bottom + x: mirror ? control.leftPadding : (indicator.x + indicator.width + control.style.spacing) + y: control.topPadding + width: parent.width - indicator.width - control.style.spacing - control.leftPadding - control.rightPadding + height: parent.height - control.topPadding - control.bottomPadding text: control.text color: control.style.textColor diff --git a/src/imports/controls/TabBar.qml b/src/imports/controls/TabBar.qml index fa6faea9..499a5ec1 100644 --- a/src/imports/controls/TabBar.qml +++ b/src/imports/controls/TabBar.qml @@ -52,8 +52,8 @@ AbstractTabBar { contentWidth: listView.contentWidth contentHeight: listView.contentHeight - implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + padding.left + padding.right) - implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + padding.top + padding.bottom) + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) Accessible.role: Accessible.PageTabList @@ -64,10 +64,10 @@ AbstractTabBar { contentItem: ListView { id: listView - x: padding.left - y: padding.top - width: parent.width - padding.left - padding.right - height: parent.height - padding.top - padding.bottom + x: control.leftPadding + y: control.topPadding + width: parent.width - control.leftPadding - control.rightPadding + height: parent.height - control.topPadding - control.bottomPadding spacing: 1 orientation: ListView.Horizontal diff --git a/src/imports/controls/TabButton.qml b/src/imports/controls/TabButton.qml index 3676a4bc..e1621c85 100644 --- a/src/imports/controls/TabButton.qml +++ b/src/imports/controls/TabButton.qml @@ -41,22 +41,25 @@ AbstractTabButton { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, - label ? label.implicitWidth + padding.left + padding.right : 0) + label ? label.implicitWidth + leftPadding + rightPadding : 0) implicitHeight: Math.max(background ? background.implicitHeight : 0, - label ? label.implicitHeight + padding.top + padding.bottom : 0) + label ? label.implicitHeight + topPadding + bottomPadding : 0) Accessible.name: text Accessible.pressed: pressed Accessible.selected: checked Accessible.role: Accessible.PageTab - padding { top: style.padding; left: style.padding; right: style.padding; bottom: style.padding } + topPadding: style.padding + leftPadding: style.padding + rightPadding: style.padding + bottomPadding: style.padding label: Text { - x: padding.left - y: padding.top - width: parent.width - padding.left - padding.right - height: parent.height - padding.top - padding.bottom + x: control.leftPadding + y: control.topPadding + width: parent.width - control.leftPadding - control.rightPadding + height: parent.height - control.topPadding - control.bottomPadding text: control.text font.pointSize: 10 diff --git a/src/imports/controls/TabView.qml b/src/imports/controls/TabView.qml index db61675b..bf785520 100644 --- a/src/imports/controls/TabView.qml +++ b/src/imports/controls/TabView.qml @@ -49,10 +49,10 @@ AbstractTabView { contentWidth: listView.implicitWidth contentHeight: listView.contentHeight - implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + padding.left + padding.right) - implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + padding.top + padding.bottom) + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) - padding.top: tabBar && tabBar.parent === control ? tabBar.height : 0 + topPadding: tabBar && tabBar.parent === control ? tabBar.height : 0 tabBar: TabBar { } @@ -68,10 +68,10 @@ AbstractTabView { Binding { target: control; property: "currentIndex"; value: listView.currentIndex } Binding { target: listView; property: "currentIndex"; value: control.currentIndex } - x: padding.left - y: padding.top - width: parent.width - padding.left - padding.right - height: parent.height - padding.top - padding.bottom + x: control.leftPadding + y: control.topPadding + width: parent.width - control.leftPadding - control.rightPadding + height: parent.height - control.topPadding - control.bottomPadding orientation: Qt.Horizontal snapMode: ListView.SnapOneItem diff --git a/src/imports/controls/TextArea.qml b/src/imports/controls/TextArea.qml index e88fafc8..699221f4 100644 --- a/src/imports/controls/TextArea.qml +++ b/src/imports/controls/TextArea.qml @@ -42,10 +42,10 @@ AbstractTextArea { implicitWidth: Math.max(background ? background.implicitWidth : 0, Math.max(edit ? edit.implicitWidth : 0, - placeholder ? placeholder.implicitWidth : 0) + padding.left + padding.right) + placeholder ? placeholder.implicitWidth : 0) + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, Math.max(edit ? edit.implicitHeight : 0, - placeholder ? placeholder.implicitHeight : 0) + padding.top + padding.bottom) + placeholder ? placeholder.implicitHeight : 0) + topPadding + bottomPadding) Accessible.name: text Accessible.multiLine: true @@ -54,10 +54,10 @@ AbstractTextArea { Accessible.description: placeholder ? placeholder.text : "" edit: TextEdit { - x: padding.left - y: padding.top - width: parent.width - padding.left - padding.right - height: parent.height - padding.top - padding.bottom + x: control.leftPadding + y: control.topPadding + width: parent.width - control.leftPadding - control.rightPadding + height: parent.height - control.topPadding - control.bottomPadding color: style.textColor selectionColor: style.selectionColor @@ -66,10 +66,10 @@ AbstractTextArea { } placeholder: Text { - x: padding.left - y: padding.top - width: parent.width - padding.left - padding.right - height: parent.height - padding.top - padding.bottom + x: control.leftPadding + y: control.topPadding + width: parent.width - control.leftPadding - control.rightPadding + height: parent.height - control.topPadding - control.bottomPadding color: control.style.textColor opacity: control.style.disabledOpacity diff --git a/src/imports/controls/TextField.qml b/src/imports/controls/TextField.qml index b303b05d..12d5e404 100644 --- a/src/imports/controls/TextField.qml +++ b/src/imports/controls/TextField.qml @@ -42,10 +42,10 @@ AbstractTextField { implicitWidth: Math.max(background ? background.implicitWidth : 0, Math.max(input ? input.implicitWidth : 0, - placeholder ? placeholder.implicitWidth : 0) + padding.left + padding.right) + placeholder ? placeholder.implicitWidth : 0) + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, Math.max(input ? input.implicitHeight : 0, - placeholder ? placeholder.implicitHeight : 0) + padding.top + padding.bottom) + placeholder ? placeholder.implicitHeight : 0) + topPadding + bottomPadding) Accessible.name: text Accessible.role: Accessible.EditableText @@ -54,13 +54,16 @@ AbstractTextField { Accessible.passwordEdit: !!input && (input.echoMode == TextInput.Password || input.echoMode === TextInput.PasswordEchoOnEdit) - padding { top: style.padding; left: style.padding; right: style.padding; bottom: style.padding } + topPadding: style.padding + leftPadding: style.padding + rightPadding: style.padding + bottomPadding: style.padding input: TextInput { - x: padding.left - y: padding.top - width: parent.width - padding.left - padding.right - height: parent.height - padding.top - padding.bottom + x: control.leftPadding + y: control.topPadding + width: parent.width - control.leftPadding - control.rightPadding + height: parent.height - control.topPadding - control.bottomPadding color: style.textColor selectionColor: style.selectionColor @@ -70,10 +73,10 @@ AbstractTextField { } placeholder: Text { - x: padding.left - y: padding.top - width: parent.width - padding.left - padding.right - height: parent.height - padding.top - padding.bottom + x: control.leftPadding + y: control.topPadding + width: parent.width - control.leftPadding - control.rightPadding + height: parent.height - control.topPadding - control.bottomPadding color: control.style.textColor opacity: control.style.disabledOpacity diff --git a/src/imports/controls/ToggleButton.qml b/src/imports/controls/ToggleButton.qml index 102c752f..a043f290 100644 --- a/src/imports/controls/ToggleButton.qml +++ b/src/imports/controls/ToggleButton.qml @@ -43,10 +43,10 @@ AbstractToggleButton { implicitWidth: Math.max(background ? background.implicitWidth : 0, (label ? label.implicitWidth : 0) + (indicator ? indicator.implicitWidth : 0) + - (label && indicator ? style.spacing : 0) + padding.left + padding.right) + (label && indicator ? style.spacing : 0) + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, Math.max(label ? label.implicitHeight : 0, - indicator ? indicator.implicitHeight : 0) + padding.top + padding.bottom) + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) Accessible.name: text Accessible.checkable: true @@ -54,14 +54,17 @@ AbstractToggleButton { Accessible.pressed: pressed Accessible.role: Accessible.Button - padding { top: style.padding; left: style.padding; right: style.padding; bottom: style.padding } + topPadding: style.padding + leftPadding: style.padding + rightPadding: style.padding + bottomPadding: style.padding indicator: Rectangle { readonly property bool mirror: control.effectiveLayoutDirection == Qt.RightToLeft implicitWidth: 36 implicitHeight: 20 - x: text ? (mirror ? parent.width - width - padding.right : padding.left) : (parent.width - width) / 2 + x: text ? (mirror ? parent.width - width - control.rightPadding : control.leftPadding) : (parent.width - width) / 2 y: (parent.height - height) / 2 radius: style.roundness @@ -94,10 +97,10 @@ AbstractToggleButton { label: Text { readonly property bool mirror: control.effectiveLayoutDirection == Qt.RightToLeft - x: mirror ? padding.left : (indicator.x + indicator.width + control.style.spacing) - y: padding.top - width: parent.width - indicator.width - control.style.spacing - padding.left - padding.right - height: parent.height - padding.top - padding.bottom + x: mirror ? control.leftPadding : (indicator.x + indicator.width + control.style.spacing) + y: control.topPadding + width: parent.width - indicator.width - control.style.spacing - control.leftPadding - control.rightPadding + height: parent.height - control.topPadding - control.bottomPadding text: control.text color: control.style.textColor diff --git a/src/imports/controls/ToolBar.qml b/src/imports/controls/ToolBar.qml index 87ada6c9..f91a2d15 100644 --- a/src/imports/controls/ToolBar.qml +++ b/src/imports/controls/ToolBar.qml @@ -43,9 +43,9 @@ AbstractToolBar { default property alias data: content.data implicitWidth: Math.max(background ? background.implicitWidth : 0, - contentWidth + padding.left + padding.right) + contentWidth + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, - contentHeight + padding.top + padding.bottom) + contentHeight + topPadding + bottomPadding) contentWidth: content.children.length === 1 ? content.children[0].implicitWidth : 0 contentHeight: content.children.length === 1 ? content.children[0].implicitHeight : 0 @@ -54,10 +54,10 @@ AbstractToolBar { contentItem: Item { id: content - x: padding.left - y: padding.top - width: parent.width - padding.left - padding.right - height: parent.height - padding.top - padding.bottom + x: control.leftPadding + y: control.topPadding + width: parent.width - control.leftPadding - control.rightPadding + height: parent.height - control.topPadding - control.bottomPadding } background: Rectangle { diff --git a/src/imports/controls/ToolButton.qml b/src/imports/controls/ToolButton.qml index c5171c45..9f838cb0 100644 --- a/src/imports/controls/ToolButton.qml +++ b/src/imports/controls/ToolButton.qml @@ -41,21 +41,24 @@ AbstractButton { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, - label ? label.implicitWidth + padding.left + padding.right : 0) + label ? label.implicitWidth + leftPadding + rightPadding : 0) implicitHeight: Math.max(background ? background.implicitHeight : 0, - label ? label.implicitHeight + padding.top + padding.bottom : 0) + label ? label.implicitHeight + topPadding + bottomPadding : 0) Accessible.name: text Accessible.pressed: pressed Accessible.role: Accessible.Button - padding { top: style.padding; left: style.padding; right: style.padding; bottom: style.padding } + topPadding: style.padding + leftPadding: style.padding + rightPadding: style.padding + bottomPadding: style.padding label: Text { - x: padding.left - y: padding.top - width: parent.width - padding.left - padding.right - height: parent.height - padding.top - padding.bottom + x: control.leftPadding + y: control.topPadding + width: parent.width - control.leftPadding - control.rightPadding + height: parent.height - control.topPadding - control.bottomPadding text: control.text color: control.style.textColor |