From bd3eeae2fdcfe703ee3db88ba647775ba2c05916 Mon Sep 17 00:00:00 2001
From: shun-iwasawa <shun.iwasawa@ghibli.jp>
Date: Fri, 25 Oct 2019 12:40:54 +0900
Subject: [PATCH] hide selected columns in function sheet

---
 toonz/sources/toonzqt/functionsheet.cpp | 29 ++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/toonz/sources/toonzqt/functionsheet.cpp b/toonz/sources/toonzqt/functionsheet.cpp
index f505977c..4ae54f98 100644
--- a/toonz/sources/toonzqt/functionsheet.cpp
+++ b/toonz/sources/toonzqt/functionsheet.cpp
@@ -462,6 +462,18 @@ void FunctionSheetColumnHeadViewer::mousePressEvent(QMouseEvent *e) {
 
     getViewer()->selectCells(rect);
   }
+  // Switch selection before opening the context menu
+  // if the clicked column is out of the selection
+  else if (e->button() == Qt::RightButton) {
+    QRect selectedCell = getViewer()->getSelectedCells();
+    if (selectedCell.left() > currentC || selectedCell.right() < currentC) {
+      int lastKeyPos = 0;
+      std::set<double> frames;
+      channel->getParam()->getKeyframes(frames);
+      if (!frames.empty()) lastKeyPos = (int)*frames.rbegin();
+      getViewer()->selectCells(QRect(currentC, 0, 1, lastKeyPos + 1));
+    }
+  }
 }
 
 //-----------------------------------------------------------------------------
@@ -497,14 +509,14 @@ void FunctionSheetColumnHeadViewer::contextMenuEvent(QContextMenuEvent *ce) {
 
     QAction showAnimatedOnly(FunctionTreeView::tr("Show Animated Only"), 0);
     QAction showAll(FunctionTreeView::tr("Show All"), 0);
+    QAction hideSelected(FunctionTreeView::tr("Hide Selected"), 0);
     menu.addAction(&showAnimatedOnly);
     menu.addAction(&showAll);
+    menu.addAction(&hideSelected);
 
     // execute menu
     QAction *action = menu.exec(globalPos);
 
-    if (action != &showAll && action != &showAnimatedOnly) return;
-
     // Process action
     if (action == &showAll) {
       int c, cCount = group->getChildCount();
@@ -521,7 +533,18 @@ void FunctionSheetColumnHeadViewer::contextMenuEvent(QContextMenuEvent *ce) {
         if (channel && !channel->isHidden())
           channel->setIsActive(channel->isAnimated());
       }
-    }
+    } else if (action == &hideSelected) {
+      QRect selectedCells = getViewer()->getSelectedCells();
+      // hide the selected columns from the right to the left
+      for (int col = selectedCells.right(); col >= selectedCells.left();
+           col--) {
+        FunctionTreeModel::Channel *chan = m_sheet->getChannel(col);
+        if (chan) chan->setIsActive(false);
+      }
+      // clear cell selection
+      getViewer()->selectCells(QRect());
+    } else
+      return;
 
     fv->update();
   }