From 4d9de7652be4def59e6fe967b98319c16b9a8fec Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Fri, 9 Nov 2018 17:05:42 +0000
Subject: [PATCH] Only scroll-focus when hoverring over preview

---
 openflexure_microscope/api/static/main_v1.js  | 31 ++++++++++---------
 .../api/static/style_v1.css                   |  1 +
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/openflexure_microscope/api/static/main_v1.js b/openflexure_microscope/api/static/main_v1.js
index 24d903d8..65248e08 100644
--- a/openflexure_microscope/api/static/main_v1.js
+++ b/openflexure_microscope/api/static/main_v1.js
@@ -98,17 +98,17 @@ function keyMoveCallback(response, status) {
 // Click-to-move
 function clickHotspotImage(event) {
     if (document.getElementById("clickPositionCheck").checked == true) {
-    xCoordinate = event.offsetX;
-    yCoordinate = event.offsetY;
-    console.log(xCoordinate, yCoordinate)
-    xRelative = (0.5*event.target.offsetWidth - xCoordinate)/event.target.offsetWidth;
-    yRelative = (0.5*event.target.offsetHeight - yCoordinate)/event.target.offsetHeight;
-    console.log(xRelative, yRelative)
-    xSteps = xRelative * fovX;
-    ySteps = yRelative * fovY;
-    console.log(xSteps, ySteps, 0)
-    // Make a position request
-    moveStagePositions(xSteps, ySteps, 0)
+        xCoordinate = event.offsetX;
+        yCoordinate = event.offsetY;
+        console.log(xCoordinate, yCoordinate)
+        xRelative = (0.5*event.target.offsetWidth - xCoordinate)/event.target.offsetWidth;
+        yRelative = (0.5*event.target.offsetHeight - yCoordinate)/event.target.offsetHeight;
+        console.log(xRelative, yRelative)
+        xSteps = xRelative * fovX;
+        ySteps = yRelative * fovY;
+        console.log(xSteps, ySteps, 0)
+        // Make a position request
+        moveStagePositions(xSteps, ySteps, 0)
     }
 }
 
@@ -116,10 +116,11 @@ function clickHotspotImage(event) {
 window.addEventListener('wheel', function(e) {
     multiplier = 1/100;
     z_delta = e.deltaY * multiplier * focusVelocity;
-    if (document.getElementById("scrollFocusCheck").checked == true) {
-    console.log(z_delta);
-    // Make a position request
-    safeRequest("POST", baseURI+"/position", { "absolute": false, "z": z_delta}, keyMoveCallback)
+    if ((document.getElementById("scrollFocusCheck").checked == true) && (e.target.parentNode.classList["value"] == "column middle")) {
+        console.log(z_delta);
+        console.log(e.target.parentNode.classList["value"]);
+        // Make a position request
+        safeRequest("POST", baseURI+"/position", { "absolute": false, "z": z_delta}, keyMoveCallback)
     }
 });
 
diff --git a/openflexure_microscope/api/static/style_v1.css b/openflexure_microscope/api/static/style_v1.css
index f45a03d6..d486979b 100644
--- a/openflexure_microscope/api/static/style_v1.css
+++ b/openflexure_microscope/api/static/style_v1.css
@@ -24,6 +24,7 @@ img {
 
 .left, .right {
   background-color: #f4f4f4;
+  overflow-y: scroll;
 }
 
 .left{