From b9dfad6b6ba71726f32885ef59bd20bf1bc8a3fe Mon Sep 17 00:00:00 2001
From: Thanos Kamber <36815670+TehThanos@users.noreply.github.com>
Date: Mon, 3 May 2021 23:16:22 +0300
Subject: [PATCH] Option invert scrolling direction for brush size (closes
 #2364)

This commit adds the option to invert if the brush size increases or
decreases when holding CTRL and scrolling as mentioned in the issue #2364

By default, the previous behavior is kept.
---
 data/pref.xml                                   | 1 +
 data/strings/en.ini                             | 1 +
 data/widgets/options.xml                        | 1 +
 src/app/commands/cmd_options.cpp                | 4 ++++
 src/app/ui/editor/state_with_wheel_behavior.cpp | 8 +++++++-
 5 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/data/pref.xml b/data/pref.xml
index 98ea133ba..630d0c745 100644
--- a/data/pref.xml
+++ b/data/pref.xml
@@ -171,6 +171,7 @@
       <option id="zoom_with_slide" type="bool" default="false" />
       <option id="zoom_from_center_with_wheel" type="bool" default="false" />
       <option id="zoom_from_center_with_keys" type="bool" default="false" />
+      <option id="invert_brush_size_scroll" type="bool" default="false" />
       <option id="show_scrollbars" type="bool" default="true" />
       <option id="auto_scroll" type="bool" default="true" />
       <option id="right_click_mode" type="RightClickMode" default="RightClickMode::PAINT_BGCOLOR" />
diff --git a/data/strings/en.ini b/data/strings/en.ini
index e9da6c5a9..8174aacd6 100644
--- a/data/strings/en.ini
+++ b/data/strings/en.ini
@@ -1126,6 +1126,7 @@ wheel_zoom = Zoom with scroll wheel
 slide_zoom = Zoom sliding two fingers up or down
 zoom_from_center_with_wheel = Zoom from center with scroll wheel
 zoom_from_center_with_keys = Zoom from center with keys
+invert_brush_size_scroll = Invert the scrolling direction for increasing the brush size
 show_scrollbars = Show scroll-bars in sprite editor
 show_scrollbars_tooltip = Show scroll-bars in all sprite editors.
 auto_scroll = Auto-scroll on editor edges
diff --git a/data/widgets/options.xml b/data/widgets/options.xml
index 894badfaf..e1bc31fff 100644
--- a/data/widgets/options.xml
+++ b/data/widgets/options.xml
@@ -224,6 +224,7 @@
                  pref="editor.zoom_with_slide" />
           <check text="@.zoom_from_center_with_wheel" id="zoom_from_center_with_wheel" />
           <check text="@.zoom_from_center_with_keys" id="zoom_from_center_with_keys" />
+          <check text="@.invert_brush_size_scroll" id="invert_brush_size_scroll" />
           <check text="@.show_scrollbars" id="show_scrollbars" tooltip="@.show_scrollbars_tooltip" />
           <check text="@.auto_scroll" id="auto_scroll" />
           <check text="@.auto_fit" id="auto_fit"
diff --git a/src/app/commands/cmd_options.cpp b/src/app/commands/cmd_options.cpp
index 4ce87bd19..9c6d8f38c 100644
--- a/src/app/commands/cmd_options.cpp
+++ b/src/app/commands/cmd_options.cpp
@@ -318,6 +318,9 @@ public:
     if (m_pref.editor.zoomFromCenterWithKeys())
       zoomFromCenterWithKeys()->setSelected(true);
 
+    if (m_pref.editor.invertBrushSizeScroll())
+      invertBrushSizeScroll()->setSelected(true);
+
     if (m_pref.selection.autoOpaque())
       autoOpaque()->setSelected(true);
 
@@ -625,6 +628,7 @@ public:
 
     m_pref.editor.zoomFromCenterWithWheel(zoomFromCenterWithWheel()->isSelected());
     m_pref.editor.zoomFromCenterWithKeys(zoomFromCenterWithKeys()->isSelected());
+    m_pref.editor.invertBrushSizeScroll(invertBrushSizeScroll()->isSelected());
     m_pref.editor.showScrollbars(showScrollbars()->isSelected());
     m_pref.editor.autoScroll(autoScroll()->isSelected());
     m_pref.editor.straightLinePreview(straightLinePreview()->isSelected());
diff --git a/src/app/ui/editor/state_with_wheel_behavior.cpp b/src/app/ui/editor/state_with_wheel_behavior.cpp
index ddc8f6961..73bc08763 100644
--- a/src/app/ui/editor/state_with_wheel_behavior.cpp
+++ b/src/app/ui/editor/state_with_wheel_behavior.cpp
@@ -190,9 +190,15 @@ bool StateWithWheelBehavior::onMouseWheel(Editor* editor, MouseMessage* msg)
       ToolPreferences::Brush& brush =
         Preferences::instance().tool(tool).brush;
 
+      int newBrushSize;
+      if (Preferences::instance().editor.invertBrushSizeScroll())
+        newBrushSize = int(brush.size()-dz);
+      else
+        newBrushSize = int(brush.size()+dz);
+
       brush.size(
         base::clamp(
-          int(brush.size()+dz),
+          newBrushSize,
           // If we use the "static const int" member directly here,
           // we'll get a linker error (when compiling without
           // optimizations) because we should need to define the