diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-09-23 15:23:39 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-09-23 14:02:27 +0000 |
| commit | 8b349ca9d2d4b08fe8f0453c75586fe1fcd482f7 (patch) | |
| tree | 5ed250352b9e1c5edce2ba8639cd310c229127a5 /examples | |
| parent | 8a5f6de53fbde11a7075fdfed4436dfbe21acaa0 (diff) | |
Templatize the former extras
Change-Id: Ief9ee07d1f5f6c80500bfa611bace860481e2a3f
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/quick/calendar/DateTimePicker.qml | 13 | ||||
| -rw-r--r-- | examples/quick/calendar/TumblerDelegate.qml | 3 |
2 files changed, 9 insertions, 7 deletions
diff --git a/examples/quick/calendar/DateTimePicker.qml b/examples/quick/calendar/DateTimePicker.qml index a3c5df7f..21519856 100644 --- a/examples/quick/calendar/DateTimePicker.qml +++ b/examples/quick/calendar/DateTimePicker.qml @@ -41,6 +41,7 @@ import QtQuick 2.6 import QtQuick.Calendar 2.0 import QtQuick.Controls 2.0 +import QtQuick.Templates 2.0 as T Item { id: dateTimePicker @@ -85,7 +86,7 @@ Item { delegate: TumblerDelegate { text: modelData - font.pixelSize: fontMetrics.font.pixelSize * (AbstractTumbler.tumbler.activeFocus ? 2 : 1.25) + font.pixelSize: fontMetrics.font.pixelSize * (T.Tumbler.tumbler.activeFocus ? 2 : 1.25) } function updateModel() { @@ -106,7 +107,7 @@ Item { model: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"] delegate: TumblerDelegate { text: modelData - font.pixelSize: fontMetrics.font.pixelSize * (AbstractTumbler.tumbler.activeFocus ? 2 : 1.25) + font.pixelSize: fontMetrics.font.pixelSize * (T.Tumbler.tumbler.activeFocus ? 2 : 1.25) } onCurrentIndexChanged: dayTumbler.updateModel() } @@ -122,7 +123,7 @@ Item { } delegate: TumblerDelegate { text: modelData - font.pixelSize: fontMetrics.font.pixelSize * (AbstractTumbler.tumbler.activeFocus ? 2 : 1.25) + font.pixelSize: fontMetrics.font.pixelSize * (T.Tumbler.tumbler.activeFocus ? 2 : 1.25) } } } @@ -137,7 +138,7 @@ Item { model: 12 delegate: TumblerDelegate { text: modelData.toString().length < 2 ? "0" + modelData : modelData - font.pixelSize: fontMetrics.font.pixelSize * (AbstractTumbler.tumbler.activeFocus ? 2 : 1.25) + font.pixelSize: fontMetrics.font.pixelSize * (T.Tumbler.tumbler.activeFocus ? 2 : 1.25) } } @@ -146,7 +147,7 @@ Item { model: 60 delegate: TumblerDelegate { text: modelData.toString().length < 2 ? "0" + modelData : modelData - font.pixelSize: fontMetrics.font.pixelSize * (AbstractTumbler.tumbler.activeFocus ? 2 : 1.25) + font.pixelSize: fontMetrics.font.pixelSize * (T.Tumbler.tumbler.activeFocus ? 2 : 1.25) } } @@ -154,7 +155,7 @@ Item { id: amPmTumbler model: ["AM", "PM"] delegate: TumblerDelegate { - font.pixelSize: fontMetrics.font.pixelSize * (AbstractTumbler.tumbler.activeFocus ? 2 : 1.25) + font.pixelSize: fontMetrics.font.pixelSize * (T.Tumbler.tumbler.activeFocus ? 2 : 1.25) } contentItem: ListView { diff --git a/examples/quick/calendar/TumblerDelegate.qml b/examples/quick/calendar/TumblerDelegate.qml index dcfb83e4..e9c7a143 100644 --- a/examples/quick/calendar/TumblerDelegate.qml +++ b/examples/quick/calendar/TumblerDelegate.qml @@ -40,11 +40,12 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 +import QtQuick.Templates 2.0 as T Text { text: isNaN(modelData) ? modelData : modelData + 1 color: "#666666" - opacity: 0.4 + Math.max(0, 1 - Math.abs(AbstractTumbler.displacement)) * 0.6 + opacity: 0.4 + Math.max(0, 1 - Math.abs(T.Tumbler.displacement)) * 0.6 horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter |