diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/controls/Private/BasicTableView.qml | 4 | ||||
-rw-r--r-- | src/controls/Private/CalendarHeaderModel.qml | 7 | ||||
-rw-r--r-- | src/controls/Styles/Base/CalendarStyle.qml | 1 | ||||
-rw-r--r-- | src/controls/Styles/Base/ProgressBarStyle.qml | 3 |
4 files changed, 9 insertions, 6 deletions
diff --git a/src/controls/Private/BasicTableView.qml b/src/controls/Private/BasicTableView.qml index c701883b..bc044eeb 100644 --- a/src/controls/Private/BasicTableView.qml +++ b/src/controls/Private/BasicTableView.qml @@ -421,9 +421,9 @@ ScrollView { interactive: Settings.hasTouchScreen property var rowItemStack: [] // Used as a cache for rowDelegates - readonly property bool transientScrollbars: __style && !!__style.transientScrollBars + readonly property bool transientScrollBars: __style && !!__style.transientScrollBars readonly property real vScrollbarPadding: __scroller.verticalScrollBar.visible - && !transientScrollbars && Qt.platform.os === "osx" ? + && !transientScrollBars && Qt.platform.os === "osx" ? __verticalScrollBar.width + __scroller.scrollBarSpacing + root.__style.padding.right : 0 Binding { diff --git a/src/controls/Private/CalendarHeaderModel.qml b/src/controls/Private/CalendarHeaderModel.qml index b978dbdc..40328a8b 100644 --- a/src/controls/Private/CalendarHeaderModel.qml +++ b/src/controls/Private/CalendarHeaderModel.qml @@ -89,7 +89,10 @@ ListModel { dayOfWeek: Locale.Saturday } - Component.onCompleted: { + Component.onCompleted: updateFirstDayOfWeek() + onLocaleChanged: updateFirstDayOfWeek() + + function updateFirstDayOfWeek() { var daysOfWeek = [Locale.Sunday, Locale.Monday, Locale.Tuesday, Locale.Wednesday, Locale.Thursday, Locale.Friday, Locale.Saturday]; var firstDayOfWeek = root.locale.firstDayOfWeek; @@ -97,7 +100,7 @@ ListModel { var shifted = daysOfWeek.splice(firstDayOfWeek, daysOfWeek.length - firstDayOfWeek); daysOfWeek = shifted.concat(daysOfWeek) - if (firstDayOfWeek !== Locale.Sunday) { + if (firstDayOfWeek !== root.get(0).dayOfWeek) { for (var i = 0; i < daysOfWeek.length; ++i) { root.setProperty(i, "dayOfWeek", daysOfWeek[i]); } diff --git a/src/controls/Styles/Base/CalendarStyle.qml b/src/controls/Styles/Base/CalendarStyle.qml index 20459274..ef0cb779 100644 --- a/src/controls/Styles/Base/CalendarStyle.qml +++ b/src/controls/Styles/Base/CalendarStyle.qml @@ -410,6 +410,7 @@ Style { anchors.leftMargin: (control.weekNumbersVisible ? weekNumbersItem.width : 0) anchors.right: parent.right spacing: gridVisible ? __gridLineWidth : 0 + property alias __repeater: repeater Repeater { id: repeater diff --git a/src/controls/Styles/Base/ProgressBarStyle.qml b/src/controls/Styles/Base/ProgressBarStyle.qml index b65c0f40..d51e056d 100644 --- a/src/controls/Styles/Base/ProgressBarStyle.qml +++ b/src/controls/Styles/Base/ProgressBarStyle.qml @@ -134,8 +134,7 @@ Style { clip: true Rectangle { id: base - width: control.width - height: control.height + anchors.fill: parent radius: TextSingleton.implicitHeight * 0.16 antialiasing: true gradient: Gradient { |