From ae3b2dd144f34dc18218334d1ac910fbf0aec1f0 Mon Sep 17 00:00:00 2001
From: David Capello <david@igara.com>
Date: Wed, 25 Oct 2023 08:36:54 -0300
Subject: [PATCH] Revert timeline behavior to the v1.2 default (#4024)

This change was introduced in dd7e27a098e94d524fb0d77d4fccf73e86657978
as a possible fix for #4024, but the change is too disruptive to be
introduced at this stage, we need some extra UI elements to make the
drag & drop accessible in both modes: the default v1.2 behavior, and
a possible new selection mode, e.g. #1498
---
 data/pref.xml                    |  2 +-
 data/strings/en.ini              |  1 -
 data/widgets/options.xml         |  3 +--
 src/app/commands/cmd_options.cpp | 20 +++++---------------
 4 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/data/pref.xml b/data/pref.xml
index 7f70beb2a..2a7ec7e9d 100644
--- a/data/pref.xml
+++ b/data/pref.xml
@@ -201,7 +201,7 @@
     </section>
     <section id="timeline">
       <option id="keep_selection" type="bool" default="false" />
-      <option id="select_on_click" type="bool" default="false" />
+      <option id="select_on_click" type="bool" default="true" />
       <option id="select_on_click_with_key" type="bool" default="true" />
       <option id="select_on_drag" type="bool" default="true" />
       <option id="drag_and_drop_from_edges" type="bool" default="true" />
diff --git a/data/strings/en.ini b/data/strings/en.ini
index 0cbee2274..a11d2de3e 100644
--- a/data/strings/en.ini
+++ b/data/strings/en.ini
@@ -1679,7 +1679,6 @@ when we press the mouse button and after we move
 the mouse to another position.
 END
 drag_and_drop_from_edges = Drag && drop from edges
-reset_as_v12 = Reset as Aseprite v1.2
 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 e9c62dec4..cdb7b95b3 100644
--- a/data/widgets/options.xml
+++ b/data/widgets/options.xml
@@ -301,9 +301,8 @@
                  text="@.drag_and_drop_from_edges"
                  pref="timeline.drag_and_drop_from_edges" />
           <hbox>
-            <hbox expansive="true" />
+            <boxfiller />
             <button id="reset_timeline_sel" text="@general.reset" width="60" />
-            <button id="reset_timeline_sel_as_v12" text="@.reset_as_v12" />
           </hbox>
 	</vbox>
 
diff --git a/src/app/commands/cmd_options.cpp b/src/app/commands/cmd_options.cpp
index 4c01e226a..83bb497b8 100644
--- a/src/app/commands/cmd_options.cpp
+++ b/src/app/commands/cmd_options.cpp
@@ -334,7 +334,6 @@ public:
     // Timeline
     firstFrame()->setTextf("%d", m_globPref.timeline.firstFrame());
     resetTimelineSel()->Click.connect([this]{ onResetTimelineSel(); });
-    resetTimelineSelAsV12()->Click.connect([this]{ onResetTimelineSelV12(); });
 
     // Others
     if (m_pref.general.expandMenubarOnMouseover())
@@ -1706,21 +1705,12 @@ private:
     layout();
   }
 
-  void onResetTimelineSelCommon() {
-    keepSelection()->setSelected(false);
-    selectOnClickWithKey()->setSelected(true);
-    selectOnDrag()->setSelected(true);
-    dragAndDropFromEdges()->setSelected(true);
-  }
-
   void onResetTimelineSel() {
-    onResetTimelineSelCommon();
-    selectOnClick()->setSelected(false);
-  }
-
-  void onResetTimelineSelV12() {
-    onResetTimelineSelCommon();
-    selectOnClick()->setSelected(true);
+    keepSelection()->setSelected(m_pref.timeline.keepSelection.defaultValue());
+    selectOnClick()->setSelected(m_pref.timeline.selectOnClick.defaultValue());
+    selectOnClickWithKey()->setSelected(m_pref.timeline.selectOnClickWithKey.defaultValue());
+    selectOnDrag()->setSelected(m_pref.timeline.selectOnDrag.defaultValue());
+    dragAndDropFromEdges()->setSelected(m_pref.timeline.dragAndDropFromEdges.defaultValue());
   }
 
   gfx::Rect gridBounds() const {