diff options
Diffstat (limited to 'src/imports/calendar')
| -rw-r--r-- | src/imports/calendar/CalendarView.qml | 12 | ||||
| -rw-r--r-- | src/imports/calendar/DayOfWeekRow.qml | 15 | ||||
| -rw-r--r-- | src/imports/calendar/WeekNumberColumn.qml | 15 |
3 files changed, 22 insertions, 20 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 |