From 8d6f889e0e2fe64583fa3c8add04ed4f1ebf47e0 Mon Sep 17 00:00:00 2001
From: David Capello <david@igarastudio.com>
Date: Wed, 31 Mar 2021 19:26:54 -0300
Subject: [PATCH] Add option to keep the timeline selection when we draw on the
 canvas

---
 data/pref.xml                    |  5 ++++-
 data/strings/en.ini              |  5 +++++
 data/widgets/options.xml         |  4 +++-
 src/app/ui/timeline/timeline.cpp | 18 +++++++++++++-----
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/data/pref.xml b/data/pref.xml
index aadf8d462..bc9f500bf 100644
--- a/data/pref.xml
+++ b/data/pref.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Aseprite -->
-<!-- Copyright (C) 2018-2020  Igara Studio S.A. -->
+<!-- Copyright (C) 2018-2021  Igara Studio S.A. -->
 <!-- Copyright (C) 2014-2018  David Capello -->
 <preferences>
 
@@ -171,6 +171,9 @@
            zoom levels -->
       <option id="auto_fit" type="bool" default="false" />
     </section>
+    <section id="timeline">
+      <option id="keep_selection" type="bool" default="false" />
+    </section>
     <section id="cursor">
       <option id="use_native_cursor" type="bool" default="false" />
       <option id="cursor_scale" type="int" default="1" />
diff --git a/data/strings/en.ini b/data/strings/en.ini
index e9c7041d8..24207e5ca 100644
--- a/data/strings/en.ini
+++ b/data/strings/en.ini
@@ -1170,6 +1170,11 @@ rewind_on_stop_tooltip = <<<END
 The 'Stop' button should rewind the animation
 where it was started.
 END
+keep_timeline_selection = Keep selection
+keep_timeline_selection_tooltip = <<<END
+Keep the selected range of layers/frames/cels
+when we edit the canvas.
+END
 default_first_frame = Default First Frame:
 ui_mouse_cursor = UI Mouse Cursor
 native_cursor = Use native mouse cursors
diff --git a/data/widgets/options.xml b/data/widgets/options.xml
index ef0dabcdc..b810f59fd 100644
--- a/data/widgets/options.xml
+++ b/data/widgets/options.xml
@@ -1,5 +1,5 @@
 <!-- Aseprite -->
-<!-- Copyright (C) 2018-2020  Igara Studio S.A. -->
+<!-- Copyright (C) 2018-2021  Igara Studio S.A. -->
 <!-- Copyright (C) 2001-2018  David Capello -->
 <gui>
   <window id="options" text="@.title">
@@ -258,6 +258,8 @@
 		 pref="general.autoshow_timeline" />
           <check text="@.rewind_on_stop" id="rewind_on_stop" tooltip="@.rewind_on_stop_tooltip"
 		 pref="general.rewind_on_stop" />
+          <check text="@.keep_timeline_selection" id="keep_selection" tooltip="@.keep_timeline_selection_tooltip"
+		 pref="timeline.keep_selection" />
 	  <hbox>
 	    <label text="@.default_first_frame" />
 	    <expr id="first_frame" />
diff --git a/src/app/ui/timeline/timeline.cpp b/src/app/ui/timeline/timeline.cpp
index 6a7d9880b..11f0dfc35 100644
--- a/src/app/ui/timeline/timeline.cpp
+++ b/src/app/ui/timeline/timeline.cpp
@@ -320,18 +320,24 @@ void Timeline::updateUsingEditor(Editor* editor)
 
   m_aniControls.updateUsingEditor(editor);
 
+  DocRange oldRange;
   if (editor != m_editor) {
     // Save active m_tagFocusBand into the old focused editor
     if (m_editor)
       m_editor->setTagFocusBand(m_tagFocusBand);
     m_tagFocusBand = -1;
   }
+  else {
+    oldRange = m_range;
+  }
 
   detachDocument();
 
-  if (m_range.enabled() &&
-      m_rangeLocks == 0) {
-    m_range.clearRange();
+  if (Preferences::instance().timeline.keepSelection())
+    m_range = oldRange;
+  else {
+    // The range is reset in detachDocument()
+    ASSERT(!m_range.enabled());
   }
 
   // We always update the editor. In this way the timeline keeps in
@@ -3991,8 +3997,10 @@ void Timeline::onNewInputPriority(InputChainElement* element,
       return;
 
     if (element != this && m_rangeLocks == 0) {
-      m_range.clearRange();
-      invalidate();
+      if (!Preferences::instance().timeline.keepSelection()) {
+        m_range.clearRange();
+        invalidate();
+      }
     }
   }
 }