From ffcccacfa589cc76f18c06655c2f984e7b01367f Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Mon, 25 Dec 2017 23:46:06 +0100
Subject: [PATCH] Selection consistency #2

---
 .../resources/qml/hifi/tablet/TabletHome.qml   | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/interface/resources/qml/hifi/tablet/TabletHome.qml b/interface/resources/qml/hifi/tablet/TabletHome.qml
index 5cf27151a7..0b450cc2e7 100644
--- a/interface/resources/qml/hifi/tablet/TabletHome.qml
+++ b/interface/resources/qml/hifi/tablet/TabletHome.qml
@@ -141,21 +141,27 @@ Item {
                             bottomMargin: 0
                         }
 
-                        function setButtonState(buttonIndex) {
-                            var itemat = gridView.contentItem.children[buttonIndex];
+                        function setButtonState(buttonIndex, buttonstate) {
+                            if (buttonIndex < 0) {
+                                return;
+                            }
+
+                            var itemat = gridView.contentItem.children[buttonIndex].children[0];
+                            console.warn("changing item at", buttonIndex, state, itemat.objectName,
+                                         gridView.contentItem.children[buttonIndex].objectName)
                             if (itemat.isActive) {
                                 itemat.state = "active state";
                             } else {
-                                itemat.state = state;
+                                itemat.state = buttonstate;
                             }
                         }
 
                         onCurrentIndexChanged: {
-                            setButtonState(previousGridIndex)
+                            setButtonState(previousGridIndex, "base state");
                             rowIndex = Math.floor(currentIndex / TabletEnums.ButtonsColumnsOnPage);
                             columnIndex = currentIndex % TabletEnums.ButtonsColumnsOnPage
                             console.warn("current index", currentIndex, rowIndex, columnIndex)
-                            setButtonState(currentIndex)
+                            setButtonState(currentIndex, "hover state");
                             previousGridIndex = currentIndex
                         }
 
@@ -166,6 +172,7 @@ Item {
 
                         delegate: Item {
                             id: wrapper
+                            objectName: "wrapper"
                             width: gridView.cellWidth
                             height: gridView.cellHeight
 
@@ -214,6 +221,7 @@ Item {
 
                 currentGridItems.currentIndex = (previousIndex > swipeView.currentIndex ? currentGridItems.count - 1 : 0);
                 previousIndex = currentIndex;
+                setButtonState(currentIndex, "hover state");
             }
 
             hoverEnabled: true