From 133129651e21096d40ebec1ac407273a16ec2881 Mon Sep 17 00:00:00 2001
From: Skycoder42 <Skycoder42@users.noreply.github.com>
Date: Mon, 25 Jun 2018 17:30:36 +0200
Subject: [PATCH] added improved time edit

---
 src/imports/mvvmquick/TimeEdit.qml    |  6 ++---
 src/imports/mvvmquick/TimeTumbler.qml | 32 +++++++++++++++++++++++++++
 src/imports/mvvmquick/mvvmquick.pro   |  3 ++-
 src/imports/mvvmquick/qmldir          |  2 ++
 4 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 src/imports/mvvmquick/TimeTumbler.qml

diff --git a/src/imports/mvvmquick/TimeEdit.qml b/src/imports/mvvmquick/TimeEdit.qml
index 91dd540..adc172b 100644
--- a/src/imports/mvvmquick/TimeEdit.qml
+++ b/src/imports/mvvmquick/TimeEdit.qml
@@ -46,7 +46,7 @@ RowLayout {
 		Layout.preferredWidth: 0
 	}
 
-	Tumbler {
+	TimeTumbler {
 		id: _hourTumbler
 		model: {
 			var model = new Array(is24Hours ? 24 : 12);
@@ -65,7 +65,7 @@ RowLayout {
 		Layout.minimumWidth: implicitWidth
 	}
 
-	Tumbler {
+	TimeTumbler {
 		id: _minuteTumbler
 		model: {
 			var mod = new Array(60)
@@ -79,7 +79,7 @@ RowLayout {
 		onCurrentIndexChanged: Qt.callLater(recalcTime)
 	}
 
-	Tumbler {
+	TimeTumbler {
 		id: _amPmTumbler
 		visible: !is24Hours
 		model: [
diff --git a/src/imports/mvvmquick/TimeTumbler.qml b/src/imports/mvvmquick/TimeTumbler.qml
new file mode 100644
index 0000000..f163ab4
--- /dev/null
+++ b/src/imports/mvvmquick/TimeTumbler.qml
@@ -0,0 +1,32 @@
+import QtQuick 2.10
+import QtQuick.Controls 2.3
+import de.skycoder42.QtMvvm.Quick 1.1
+
+Tumbler {
+	id: _timeTumbler
+
+	function highlightColor() {
+		if(QuickPresenter.currentStyle === "Material")
+			return Material.accentColor;
+		else if(QuickPresenter.currentStyle === "Universal")
+			return Universal.accent;
+		else
+			return palette.highlight;
+	}
+
+	Rectangle {
+		anchors.centerIn: parent
+		anchors.verticalCenterOffset: -0.5 * currentItem.height
+		width: currentItem.width * 0.8
+		height: 1
+		color: parent.enabled ? highlightColor() : palette.text
+	}
+
+	Rectangle {
+		anchors.centerIn: parent
+		anchors.verticalCenterOffset: 0.5 * currentItem.height
+		width: currentItem.width * 0.8
+		height: 1
+		color: parent.enabled ? highlightColor() : palette.text
+	}
+}
diff --git a/src/imports/mvvmquick/mvvmquick.pro b/src/imports/mvvmquick/mvvmquick.pro
index 1528544..5dadc21 100644
--- a/src/imports/mvvmquick/mvvmquick.pro
+++ b/src/imports/mvvmquick/mvvmquick.pro
@@ -54,7 +54,8 @@ QML_FILES += \
 	RoundMenuButton.qml \
 	DecorLabel.qml \
 	MsgDelegate.qml \
-	TimeEdit.qml
+	TimeEdit.qml \
+	TimeTumbler.qml
 
 RESOURCES += \
 	qtmvvmquick_plugin.qrc
diff --git a/src/imports/mvvmquick/qmldir b/src/imports/mvvmquick/qmldir
index 8374717..62b3d34 100644
--- a/src/imports/mvvmquick/qmldir
+++ b/src/imports/mvvmquick/qmldir
@@ -16,6 +16,8 @@ internal ListSection ListSection.qml
 internal SectionListView SectionListView.qml
 internal OverviewListView OverviewListView.qml
 
+internal TimeTumbler TimeTumbler.qml
+
 AlertDialog 1.0 AlertDialog.qml
 ContrastToolBar 1.0 ContrastToolBar.qml
 ToolBarLabel 1.0 ToolBarLabel.qml