From 567028ac7760da19cba8d413e1d70dec21e66cfb Mon Sep 17 00:00:00 2001
From: manongjohn <19245851+manongjohn@users.noreply.github.com>
Date: Thu, 22 Dec 2022 09:26:16 -0500
Subject: [PATCH] Move Cell Selection with Current Frame Navigation

---
 toonz/sources/toonz/vcrcommand.cpp | 70 +++++++++++++++++++++++++++++-
 toonz/sources/toonz/xsheetcmd.cpp  | 20 ++++++++-
 2 files changed, 87 insertions(+), 3 deletions(-)

diff --git a/toonz/sources/toonz/vcrcommand.cpp b/toonz/sources/toonz/vcrcommand.cpp
index 47a2258f..019b269e 100644
--- a/toonz/sources/toonz/vcrcommand.cpp
+++ b/toonz/sources/toonz/vcrcommand.cpp
@@ -5,10 +5,12 @@
 #include "tapp.h"
 #include "sceneviewer.h"
 #include "stopmotion.h"
+#include "cellselection.h"
 
 // TnzQt includes
 #include "toonzqt/menubarcommand.h"
 #include "toonzqt/flipconsole.h"
+#include "toonzqt/tselectionhandle.h"
 
 // TnzLib includes
 #include "toonz/txsheet.h"
@@ -40,7 +42,23 @@ public:
       : MenuItemHandler(cmdId), m_buttonId(buttonId) {}
   void execute() override {
     FlipConsole *console = FlipConsole::getCurrent();
-    if (console) console->pressButton(m_buttonId);
+    if (console) {
+      console->pressButton(m_buttonId);
+
+      if (m_buttonId != FlipConsole::eFirst &&
+          m_buttonId != FlipConsole::eLast &&
+          m_buttonId != FlipConsole::eNext && m_buttonId != FlipConsole::ePrev)
+        return;
+
+      int row = TApp::instance()->getCurrentFrame()->getFrame();
+      TCellSelection *cellSelection = dynamic_cast<TCellSelection *>(
+          TApp::instance()->getCurrentSelection()->getSelection());
+      if (cellSelection) {
+        int r0, r1, c0, c1;
+        cellSelection->getSelectedCells(r0, c0, r1, c1);
+        cellSelection->selectCells(row, c0, r1 + (row - r0), c1);
+      }
+    }
   }
 };
 
@@ -64,6 +82,14 @@ public:
       if (xsh->getCell(row, col).isEmpty()) continue;
       if (xsh->getCell(row, col) != cell) {
         TApp::instance()->getCurrentFrame()->setFrame(row);
+
+        TCellSelection *cellSelection = dynamic_cast<TCellSelection *>(
+            TApp::instance()->getCurrentSelection()->getSelection());
+        if (cellSelection) {
+          int r0, r1, c0, c1;
+          cellSelection->getSelectedCells(r0, c0, r1, c1);
+          cellSelection->selectCells(row, c0, r1 + (row - r0), c1);
+        }
         break;
       }
     }
@@ -99,6 +125,14 @@ public:
       // Get *first* cell in current uniform cell block
       while (row > 0 && xsh->getCell(row - 1, col) == cell) --row;
       TApp::instance()->getCurrentFrame()->setFrame(row);
+
+      TCellSelection *cellSelection = dynamic_cast<TCellSelection *>(
+          TApp::instance()->getCurrentSelection()->getSelection());
+      if (cellSelection) {
+        int r0, r1, c0, c1;
+        cellSelection->getSelectedCells(r0, c0, r1, c1);
+        cellSelection->selectCells(row, c0, r1 + (row - r0), c1);
+      }
     }
   }
 };
@@ -114,6 +148,14 @@ public:
     int step = Preferences::instance()->getXsheetStep();
 
     TApp::instance()->getCurrentFrame()->setFrame(row + step);
+
+    TCellSelection *cellSelection = dynamic_cast<TCellSelection *>(
+        TApp::instance()->getCurrentSelection()->getSelection());
+    if (cellSelection) {
+      int r0, r1, c0, c1;
+      cellSelection->getSelectedCells(r0, c0, r1, c1);
+      cellSelection->selectCells(r0 + step, c0, r1 + step, c1);
+    }
   }
 };
 
@@ -128,6 +170,14 @@ public:
     int step = Preferences::instance()->getXsheetStep();
 
     TApp::instance()->getCurrentFrame()->setFrame(std::max(row - step, 0));
+
+    TCellSelection *cellSelection = dynamic_cast<TCellSelection *>(
+        TApp::instance()->getCurrentSelection()->getSelection());
+    if (cellSelection) {
+      int r0, r1, c0, c1;
+      cellSelection->getSelectedCells(r0, c0, r1, c1);
+      cellSelection->selectCells(r0 - step, c0, r1 - step, c1);
+    }
   }
 };
 
@@ -178,6 +228,15 @@ public:
         if (std::find(navControlList, navControlList + 6, pane) !=
             (navControlList + 6)) {
           TApp::instance()->getCurrentFrame()->emitTriggerNextKeyframe(panel);
+
+          int row = TApp::instance()->getCurrentFrame()->getFrame();
+          TCellSelection *cellSelection = dynamic_cast<TCellSelection *>(
+              TApp::instance()->getCurrentSelection()->getSelection());
+          if (cellSelection) {
+            int r0, r1, c0, c1;
+            cellSelection->getSelectedCells(r0, c0, r1, c1);
+            cellSelection->selectCells(row, c0, r1 + (row - r0), c1);
+          }
           break;
         } else
           panel = TApp::instance()->getActiveViewer()->parentWidget();
@@ -207,6 +266,15 @@ public:
         if (std::find(navControlList, navControlList + 6, pane) !=
             (navControlList + 6)) {
           TApp::instance()->getCurrentFrame()->emitTriggerPrevKeyframe(panel);
+
+          int row = TApp::instance()->getCurrentFrame()->getFrame();
+          TCellSelection *cellSelection = dynamic_cast<TCellSelection *>(
+              TApp::instance()->getCurrentSelection()->getSelection());
+          if (cellSelection) {
+            int r0, r1, c0, c1;
+            cellSelection->getSelectedCells(r0, c0, r1, c1);
+            cellSelection->selectCells(row, c0, r1 + (row - r0), c1);
+          }
           break;
         } else
           panel = TApp::instance()->getActiveViewer()->parentWidget();
diff --git a/toonz/sources/toonz/xsheetcmd.cpp b/toonz/sources/toonz/xsheetcmd.cpp
index cb04ecca..3ea29c94 100644
--- a/toonz/sources/toonz/xsheetcmd.cpp
+++ b/toonz/sources/toonz/xsheetcmd.cpp
@@ -2804,8 +2804,16 @@ public:
 
     NavigationTags *navTags = xsh->getNavigationTags();
     int nextFrame           = navTags->getNextTag(frame);
-    if (nextFrame != -1)
+    if (nextFrame != -1) {
       app->getCurrentXsheetViewer()->setCurrentRow(nextFrame);
+      TCellSelection *cellSelection = dynamic_cast<TCellSelection *>(
+          TApp::instance()->getCurrentSelection()->getSelection());
+      if (cellSelection) {
+        int r0, r1, c0, c1;
+        cellSelection->getSelectedCells(r0, c0, r1, c1);
+        cellSelection->selectCells(nextFrame, c0, r1 + (nextFrame - r0), c1);
+      }
+    }
   }
 } NextTaggedFrame;
 
@@ -2822,8 +2830,16 @@ public:
 
     NavigationTags *navTags = xsh->getNavigationTags();
     int prevFrame           = navTags->getPrevTag(frame);
-    if (prevFrame != -1)
+    if (prevFrame != -1) {
       app->getCurrentXsheetViewer()->setCurrentRow(prevFrame);
+      TCellSelection *cellSelection = dynamic_cast<TCellSelection *>(
+          TApp::instance()->getCurrentSelection()->getSelection());
+      if (cellSelection) {
+        int r0, r1, c0, c1;
+        cellSelection->getSelectedCells(r0, c0, r1, c1);
+        cellSelection->selectCells(prevFrame, c0, r1 + (prevFrame - r0), c1);
+      }
+    }
   }
 } PrevTaggedFrame;