From 50b0a458ce331a7cb0b0ee643f60591b26589d07 Mon Sep 17 00:00:00 2001
From: Roxanne Skelly <roxanne@highfidelity.io>
Date: Tue, 14 Aug 2018 16:32:56 -0700
Subject: [PATCH] Changes as requested by zfox23 - Start and stop timers on
hover only if scroll is enabled.
---
interface/resources/qml/hifi/Feed.qml | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/interface/resources/qml/hifi/Feed.qml b/interface/resources/qml/hifi/Feed.qml
index 135123595b..346481fe1f 100644
--- a/interface/resources/qml/hifi/Feed.qml
+++ b/interface/resources/qml/hifi/Feed.qml
@@ -143,11 +143,15 @@ Column {
shadowHeight: root.stackedCardShadowHeight;
hoverThunk: function () {
hovered = true;
- autoScrollTimer.stop();
+ if(root.autoScrollTimerEnabled) {
+ autoScrollTimer.stop();
+ }
}
unhoverThunk: function () {
hovered = false;
- autoScrollTimer.start();
+ if(root.autoScrollTimerEnabled) {
+ autoScrollTimer.start();
+ }
}
}