From 7fea99a718166e13144ef96e80befbb0c0a0545b Mon Sep 17 00:00:00 2001
From: David Capello <david@igarastudio.com>
Date: Thu, 5 May 2022 09:26:19 -0300
Subject: [PATCH] Move the "invert wheel for brush size" option to Edit >
 Keyboard Shortcuts > Mouse Wheel

---
 data/pref.xml                                   | 2 +-
 data/strings/en.ini                             | 2 +-
 data/widgets/keyboard_shortcuts.xml             | 2 ++
 data/widgets/options.xml                        | 1 -
 src/app/commands/cmd_options.cpp                | 4 ----
 src/app/ui/editor/state_with_wheel_behavior.cpp | 2 +-
 6 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/data/pref.xml b/data/pref.xml
index 630d0c745..9c7169dbd 100644
--- a/data/pref.xml
+++ b/data/pref.xml
@@ -171,7 +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="invert_brush_size_wheel" 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 8174aacd6..d663979ec 100644
--- a/data/strings/en.ini
+++ b/data/strings/en.ini
@@ -799,6 +799,7 @@ section_mouse_wheel = Mouse Wheel
 default_wheel_behavior = Default
 custom_wheel_behavior = Custom
 slide_as_wheel = Interpret two fingers slide on Trackpad as mouse wheel
+invert_brush_size_wheel = Invert the mouse wheel direction for increasing the brush size
 ok = &OK
 cancel = &Cancel
 
@@ -1126,7 +1127,6 @@ 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/keyboard_shortcuts.xml b/data/widgets/keyboard_shortcuts.xml
index 511ba7e08..6c8da528e 100644
--- a/data/widgets/keyboard_shortcuts.xml
+++ b/data/widgets/keyboard_shortcuts.xml
@@ -49,6 +49,8 @@
                    pref="editor.zoom_with_wheel" />
             <check text="@options.slide_zoom" id="slide_zoom"
                    pref="editor.zoom_with_slide" />
+            <check text="@.invert_brush_size_wheel" id="invert_brush_size_scroll"
+                   pref="editor.invert_brush_size_wheel" />
             <view expansive="true">
               <listbox id="wheel_actions" />
             </view>
diff --git a/data/widgets/options.xml b/data/widgets/options.xml
index e1bc31fff..894badfaf 100644
--- a/data/widgets/options.xml
+++ b/data/widgets/options.xml
@@ -224,7 +224,6 @@
                  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 9c6d8f38c..4ce87bd19 100644
--- a/src/app/commands/cmd_options.cpp
+++ b/src/app/commands/cmd_options.cpp
@@ -318,9 +318,6 @@ 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);
 
@@ -628,7 +625,6 @@ 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 258cb47ff..ef27a9bd5 100644
--- a/src/app/ui/editor/state_with_wheel_behavior.cpp
+++ b/src/app/ui/editor/state_with_wheel_behavior.cpp
@@ -199,7 +199,7 @@ bool StateWithWheelBehavior::onMouseWheel(Editor* editor, MouseMessage* msg)
 
       // We can configure the mouse wheel for brush size to behave as
       // in previous versions.
-      if (Preferences::instance().editor.invertBrushSizeScroll())
+      if (Preferences::instance().editor.invertBrushSizeWheel())
         dz = -dz;
 
       brush.size(