From 7319b0a7c2310e5e492b557d99ae4a79d2720ebf Mon Sep 17 00:00:00 2001
From: Wakefield Morys-Carter <wakefield.morys-carter@brookes.ac.uk>
Date: Sat, 22 May 2021 20:46:42 +0100
Subject: [PATCH] 1.8 / fontSize

---
 scroll-text-legacy-browsers.js | 4 ++--
 scroll-text.js                 | 4 ++--
 scroll-text.psyexp             | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scroll-text-legacy-browsers.js b/scroll-text-legacy-browsers.js
index 95d29d9..6252cb5 100644
--- a/scroll-text-legacy-browsers.js
+++ b/scroll-text-legacy-browsers.js
@@ -310,8 +310,8 @@ function trialRoutineBegin(snapshot) {
     moving = 0;
     
     scrollText.setPos([((- 0.45) * screenRatio), 0.45]);
-    maxScroll +=round(2/fontSize);
-    maxScroll -=120;
+    maxScroll +=round(1.8/fontSize);
+    maxScroll -=115;
     //.04 => 39 but needs to be 20
     //.03 => 52
     //.02 => 79 but needs to be 99
diff --git a/scroll-text.js b/scroll-text.js
index d4a59eb..899a29a 100644
--- a/scroll-text.js
+++ b/scroll-text.js
@@ -320,8 +320,8 @@ function trialRoutineBegin(snapshot) {
     moving = 0;
     
     scrollText.setPos([((- 0.45) * screenRatio), 0.45]);
-    maxScroll +=round(2/fontSize);
-    maxScroll -=120;
+    maxScroll +=round(1.8/fontSize);
+    maxScroll -=115;
     //.04 => 39 but needs to be 20
     //.03 => 52
     //.02 => 79 but needs to be 99
diff --git a/scroll-text.psyexp b/scroll-text.psyexp
index 368a451..412d7c4 100644
--- a/scroll-text.psyexp
+++ b/scroll-text.psyexp
@@ -143,7 +143,7 @@
         <Param name="Before JS Experiment" updates="constant" val="" valType="extendedCode"/>
         <Param name="Begin Experiment" updates="constant" val="import math" valType="extendedCode"/>
         <Param name="Begin JS Experiment" updates="constant" val="" valType="extendedCode"/>
-        <Param name="Begin JS Routine" updates="constant" val="maxScroll +=round(2/fontSize);&amp;#10;maxScroll -=120;&amp;#10;//.04 =&gt; 39 but needs to be 20&amp;#10;//.03 =&gt; 52&amp;#10;//.02 =&gt; 79 but needs to be 99&amp;#10;scrollText.setAlignHoriz('left');&amp;#10;scrollText.setAlignVert('top');" valType="extendedCode"/>
+        <Param name="Begin JS Routine" updates="constant" val="maxScroll +=round(1.8/fontSize);&amp;#10;maxScroll -=115;&amp;#10;//.04 =&gt; 39 but needs to be 20&amp;#10;//.03 =&gt; 52&amp;#10;//.02 =&gt; 79 but needs to be 99&amp;#10;scrollText.setAlignHoriz('left');&amp;#10;scrollText.setAlignVert('top');" valType="extendedCode"/>
         <Param name="Begin Routine" updates="constant" val="maxScroll-=round(1.5/fontSize)-1&amp;#10;scrollText.anchorHoriz='left'&amp;#10;scrollText.anchorVert='top'&amp;#10;scrollText.alignText='left'" valType="extendedCode"/>
         <Param name="Code Type" updates="None" val="Both" valType="str"/>
         <Param name="Each Frame" updates="constant" val="" valType="extendedCode"/>
-- 
2.18.1