diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-03-06 11:52:10 +0100 |
|---|---|---|
| committer | Jari-Pekka Nurmi <jpnurmi@theqtcompany.com> | 2015-03-11 01:06:44 +0200 |
| commit | a3921bcf01275425350c9c153fe92086a34d1403 (patch) | |
| tree | 1c5c4dd36e9d19a36281bde723c7bf989bc70298 /src/imports/calendar | |
| parent | e9398b7465c7df38876d0c6528ea5c42bbd8bf6a (diff) | |
Implement Style as an attached property
Change-Id: I006ee566647e31d1a14919d164d7dd68539aae10
Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/imports/calendar')
| -rw-r--r-- | src/imports/calendar/CalendarView.qml | 4 | ||||
| -rw-r--r-- | src/imports/calendar/DayOfWeekRow.qml | 6 | ||||
| -rw-r--r-- | src/imports/calendar/WeekNumberColumn.qml | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/imports/calendar/CalendarView.qml b/src/imports/calendar/CalendarView.qml index 3dfe5074..541c7d6b 100644 --- a/src/imports/calendar/CalendarView.qml +++ b/src/imports/calendar/CalendarView.qml @@ -45,9 +45,9 @@ AbstractCalendarView { width: grid.width ? grid.width / 7 : implicitWidth height: grid.height ? grid.height / 6 : implicitHeight opacity: model.month === control.month ? 1 : 0 - color: model.today ? style.accentColor : style.textColor + color: model.today ? control.Style.accentColor : control.Style.textColor text: model.day - padding: style.padding + padding: control.Style.padding } contentWidth: grid.implicitWidth diff --git a/src/imports/calendar/DayOfWeekRow.qml b/src/imports/calendar/DayOfWeekRow.qml index 6c03ddd6..ef59ec5f 100644 --- a/src/imports/calendar/DayOfWeekRow.qml +++ b/src/imports/calendar/DayOfWeekRow.qml @@ -44,7 +44,7 @@ AbstractDayOfWeekRow { property Component delegate: Text { text: model.shortName font.bold: true - color: control.style.textColor + color: control.Style.textColor width: row.width ? row.width / 7 : implicitWidth height: row.height ? row.height : implicitHeight horizontalAlignment: Text.AlignHCenter @@ -57,8 +57,8 @@ AbstractDayOfWeekRow { implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) - topPadding: style.padding - bottomPadding: style.padding + topPadding: Style.padding + bottomPadding: Style.padding contentItem: Row { id: row diff --git a/src/imports/calendar/WeekNumberColumn.qml b/src/imports/calendar/WeekNumberColumn.qml index 15037be1..732a914a 100644 --- a/src/imports/calendar/WeekNumberColumn.qml +++ b/src/imports/calendar/WeekNumberColumn.qml @@ -44,7 +44,7 @@ AbstractWeekNumberColumn { property Component delegate: Text { text: model.weekNumber font.bold: true - color: control.style.textColor + color: control.Style.textColor width: column.width ? column.width : implicitWidth height: column.height ? column.height / 6 : implicitHeight horizontalAlignment: Text.AlignHCenter @@ -57,8 +57,8 @@ AbstractWeekNumberColumn { implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) - leftPadding: style.padding - rightPadding: style.padding + leftPadding: Style.padding + rightPadding: Style.padding contentItem: Column { id: column |