diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-06-14 20:47:16 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-06-14 18:49:33 +0000 |
| commit | d2b13164d85fffc7d379304ca5aefc9304e53a8a (patch) | |
| tree | 866e5b9055e7e67a70f6a3e53702f52c4c0c7818 /src/imports/calendar | |
| parent | 2ae178f42442d633ac4563315f212a6cdcc5b174 (diff) | |
Remove contentWidth/Height usage where applicable
Change-Id: If8213f3416511c4881e5a7cd8904e4624ddd06bb
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/imports/calendar')
| -rw-r--r-- | src/imports/calendar/CalendarView.qml | 9 | ||||
| -rw-r--r-- | src/imports/calendar/DayOfWeekRow.qml | 9 | ||||
| -rw-r--r-- | src/imports/calendar/WeekNumberColumn.qml | 9 |
3 files changed, 12 insertions, 15 deletions
diff --git a/src/imports/calendar/CalendarView.qml b/src/imports/calendar/CalendarView.qml index d9d5d42f..b13c1b52 100644 --- a/src/imports/calendar/CalendarView.qml +++ b/src/imports/calendar/CalendarView.qml @@ -50,11 +50,10 @@ AbstractCalendarView { padding: control.Theme.padding } - contentWidth: grid.implicitWidth - contentHeight: grid.implicitHeight - - implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) Accessible.name: title diff --git a/src/imports/calendar/DayOfWeekRow.qml b/src/imports/calendar/DayOfWeekRow.qml index cec70551..c351dd97 100644 --- a/src/imports/calendar/DayOfWeekRow.qml +++ b/src/imports/calendar/DayOfWeekRow.qml @@ -51,11 +51,10 @@ AbstractDayOfWeekRow { verticalAlignment: Text.AlignVCenter } - contentWidth: row.implicitWidth - contentHeight: row.implicitHeight - - implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) topPadding: Theme.padding bottomPadding: Theme.padding diff --git a/src/imports/calendar/WeekNumberColumn.qml b/src/imports/calendar/WeekNumberColumn.qml index 149384f3..a396d645 100644 --- a/src/imports/calendar/WeekNumberColumn.qml +++ b/src/imports/calendar/WeekNumberColumn.qml @@ -51,11 +51,10 @@ AbstractWeekNumberColumn { verticalAlignment: Text.AlignVCenter } - contentWidth: column.implicitWidth - contentHeight: column.implicitHeight - - implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) leftPadding: Theme.padding rightPadding: Theme.padding |