messagegui: WIP new message scroller

Author: thyttan

apps/messagegui/app.js

@@ -274,14 +274,14 @@ function showMessageScroller(msg) {
   });
 }
 
-function showMessageScroller2(msg, initAtEndOfMsg, persist, alreadyProcessed) {
+function showMessageScroller2(msg, persist, initAtEndOfMsg, alreadyProcessed) {
   if (initAtEndOfMsg===undefined) {initAtEndOfMsg = false;}
   if (persist===undefined) {persist = true;}
-  if (!!alreadyProcessed) {
-    alreadyProcessed = { lines : [], idxSpan : [] };
-    //alreadyProcessed.lines = [];
-    //alreadyProcessed.idxSpan = [];
-  }
+  //if (!!alreadyProcessed) {
+  //  alreadyProcessed = { lines : [], startIdx : undefined, stopIdx : undefined };
+  //}
+  
+  print(alreadyProcessed);
 
   if (replying) { return; }
   if (persist) {
@@ -291,20 +291,28 @@ function showMessageScroller2(msg, initAtEndOfMsg, persist, alreadyProcessed) {
   }
 
   let msgIdx = MESSAGES.findIndex((m) =>  m.id == msg.id)
-  //print("msgIdx",msgIdx);
+  print("msgIdx",msgIdx);
+  print(msg);
+
+  let cacheObj = {};
+
   let startIdx = 0;
   let stopIdx = 0;
 
-  if (alreadyProcessed.idxSpan.length===0){
+  if (alreadyProcessed===undefined){
     startIdx = Math.max(msgIdx-1, 0);
     stopIdx = Math.min(msgIdx+2, MESSAGES.length);
-  } else if (msgIdx < alreadyProcessed.startIdx) {
-    startIdx = Math.max(msgIdx, 0);
+    cacheObj = Object.assign({startIdx:startIdx, stopIdx:stopIdx})
+  } else if (msgIdx <= alreadyProcessed.startIdx) {
+    startIdx = Math.max(msgIdx-1, 0);
     stopIdx = alreadyProcessed.startIdx;
-  } else if (msgid >= alreadyProcessed.stopIdx){
+    cacheObj = Object.assign({startIdx:startIdx, stopIdx:alreadyProcessed.stopIdx})
+  } else if (msgIdx >= alreadyProcessed.stopIdx-1){
     startIdx = alreadyProcessed.stopIdx;
-    stopIdx = Math.min(msgIdx, MESSAGES.length);
+    stopIdx = Math.min(msgIdx+2, MESSAGES.length);
+    cacheObj = Object.assign({startIdx:alreadyProcessed.startIdx, stopIdx:stopIdx})
   }
+  print(startIdx, stopIdx);
 
   active = "scroller";
   var bodyFont = fontBig;
@@ -342,14 +350,24 @@ function showMessageScroller2(msg, initAtEndOfMsg, persist, alreadyProcessed) {
   for (let i=0;i<messagesWrapped.length;i++) {
     allLines2 = allLines2.concat(messagesWrapped[i]);
   }
-  var initScroll = messagesWrapped[0].length;
-  if (msgIdx==0) initScroll = 0;
-  if (!!initAtEndOfMsg) {
-    let i = msgIdx==0?0:1;
-    initScroll += messagesWrapped[i].length>8?messagesWrapped[i].length-8:0;
+
+  if (alreadyProcessed===undefined){
+    // no-op
+  } else if (msgIdx <= alreadyProcessed.startIdx) {
+    allLines2 = allLines2.concat(alreadyProcessed.lines);
+  } else if (msgIdx >= alreadyProcessed.stopIdx-1){
+    allLines2 = alreadyProcessed.lines.concat(allLines2);
   }
 
-  if (allLines2.length == 0 && alreadyProcessed.idxSpan.length == 0) {
+ // var initScroll = messagesWrapped[0].length;
+ // if (msgIdx==0) initScroll = 0;
+ // if (!!initAtEndOfMsg) {
+ //   let i = msgIdx==0?0:1;
+ //   initScroll += messagesWrapped[i].length>8?messagesWrapped[i].length-8:0;
+ // }
+  var initScroll = 10;
+
+  if (allLines2.length == 0 && alreadyProcessed.lines.length == 0) {
     cancelReloadTimeout();
     returnToClockIfEmpty();
   }
@@ -359,13 +377,13 @@ function showMessageScroller2(msg, initAtEndOfMsg, persist, alreadyProcessed) {
   //print("allLines2:\n",allLines2);
   //print("messagesWrapped:\n",messagesWrapped);
 
-  let cacheObj = { 
+  cacheObj = Object.assign(
+{ 
     lines : allLines2,
-    startIdx : Math.min(startIdx, alreadyProcessed.startIdx),
-    stopIdx : Math.max(stopIdx, alreadyProcessed.stopIdx),
     titleLines : titleLines,
     messagesWrappedLength : messagesWrapped.length,
-  };
+  }, cacheObj
+  )
 
   E.showScroller({
     scroll : initScroll*g.getFontHeight(),
@@ -381,12 +399,12 @@ function showMessageScroller2(msg, initAtEndOfMsg, persist, alreadyProcessed) {
       g.setFont(bodyFont).setFontAlign(0,-1).drawString(allLines2[idx], r.x+r.w/2, r.y);
       if (idx>=allLines2.length-1 && msgIdx<MESSAGES.length-1) {
         setTimeout(()=>{
-          showMessageScroller2(MESSAGES[msgIdx+1], true, cacheObj);
+          showMessageScroller2(MESSAGES[msgIdx+1], true, true, cacheObj);
         }, 0)
       }
       if (idx==0 && msgIdx>0) {
         setTimeout(()=>{
-          showMessageScroller2(MESSAGES[msgIdx-1], false, cacheObj);
+          showMessageScroller2(MESSAGES[msgIdx-1], true, false, cacheObj);
         }, 0)
       }
     }, select : function(idx, touch) {