From 2394cbe4b2b7bf5467f640aa559bb2d08a20e591 Mon Sep 17 00:00:00 2001
From: Enfyve <8909014+Enfyve@users.noreply.github.com>
Date: Sun, 25 Apr 2021 19:04:06 -0400
Subject: [PATCH 01/17] Fix external folder manipulation (fix #232)

Updates folder upon navigation (up, back, forward, in).

Also introduces a new button to refresh the current folder view when pressed or when hotkey pressed (F5 or ctrl+R)
---
 data/extensions/aseprite-theme/sheet.png | Bin 14929 -> 14981 bytes
 data/extensions/aseprite-theme/theme.xml |   6 +++++
 data/strings/en.ini                      |   1 +
 data/widgets/file_selector.xml           |   2 ++
 src/app/ui/file_selector.cpp             |  31 +++++++++++++++++++++++
 src/app/ui/file_selector.h               |   3 +++
 6 files changed, 43 insertions(+)

diff --git a/data/extensions/aseprite-theme/sheet.png b/data/extensions/aseprite-theme/sheet.png
index 80f5ab3c74a8468aed0a8118ce40fbd88477b12a..a991421ab659898f268e2c83f55e9b9871f775be 100644
GIT binary patch
delta 14856
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
HCPDuPK5Tl}

delta 14771
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

diff --git a/data/extensions/aseprite-theme/theme.xml b/data/extensions/aseprite-theme/theme.xml
index e7067f6e9..c7ba34d42 100644
--- a/data/extensions/aseprite-theme/theme.xml
+++ b/data/extensions/aseprite-theme/theme.xml
@@ -192,6 +192,8 @@
         <part id="combobox_arrow_right" x="99" y="196" w="9" h="9" />
         <part id="combobox_arrow_right_selected" x="115" y="196" w="9" h="9" />
         <part id="combobox_arrow_right_disabled" x="131" y="196" w="9" h="9" />
+        <part id="arrow_circle_cw" x="99" y="243" w="10" h="10" />
+        <part id="arrow_circle_cw_selected" x="115" y="243" w="10" h="10" />
         <part id="newfolder" x="99" y="211" w="9" h="9" />
         <part id="newfolder_selected" x="115" y="211" w="9" h="9" />
         <part id="list_view" x="96" y="224" w="9" h="9" />
@@ -629,6 +631,10 @@
             <icon part="combobox_arrow_up_selected" state="selected" />
             <icon part="combobox_arrow_up_disabled" state="disabled" />
         </style>
+        <style id="refresh_button" extends="mini_button">
+            <icon part="arrow_circle_cw" />
+            <icon part="arrow_circle_cw_selected" state="selected" />
+        </style>
         <style id="new_folder_button" extends="mini_button">
             <icon part="newfolder" />
             <icon part="newfolder_selected" state="selected" />
diff --git a/data/strings/en.ini b/data/strings/en.ini
index 63f08ea45..66da10554 100644
--- a/data/strings/en.ini
+++ b/data/strings/en.ini
@@ -663,6 +663,7 @@ generating = Generating...
 go_back_button_tooltip = Go back one folder
 go_forward_button_tooltip = Go forward one folder
 go_up_button_tooltip = Up to parent folder
+refresh_button_tooltip = Refresh folder view
 new_folder_button_tooltip = New folder
 list_view_button_tooltip = List View
 small_icon_view_button_tooltip = Small Icons View
diff --git a/data/widgets/file_selector.xml b/data/widgets/file_selector.xml
index 8156cd945..8b16b7a16 100644
--- a/data/widgets/file_selector.xml
+++ b/data/widgets/file_selector.xml
@@ -13,6 +13,8 @@
       </hbox>
       <button text="" id="go_up_button" style="go_up_button"
               tooltip="@.go_up_button_tooltip" tooltip_dir="bottom" />
+      <button text="" id="refresh_button" style="refresh_button"
+                tooltip="@.refresh_button_tooltip" tooltip_dir="bottom" />
       <button text="" id="new_folder_button" style="new_folder_button"
               tooltip="@.new_folder_button_tooltip" tooltip_dir="bottom" />
       <buttonset id="view_type" columns="3">
diff --git a/src/app/ui/file_selector.cpp b/src/app/ui/file_selector.cpp
index 3249bbce8..f1be02bc0 100644
--- a/src/app/ui/file_selector.cpp
+++ b/src/app/ui/file_selector.cpp
@@ -279,6 +279,7 @@ protected:
         bool enter = (msg->altPressed() && scancode == kKeyDown);
         bool back = (msg->altPressed() && scancode == kKeyLeft);
         bool forward = (msg->altPressed() && scancode == kKeyRight);
+        bool refresh = (scancode == kKeyF5 || (msg->ctrlPressed() && scancode == kKeyR));
 #endif
 
         if (up) {
@@ -297,6 +298,9 @@ protected:
           m_filesel->goForward();
           return true;
         }
+        if (refresh) {
+          m_filesel->refreshCurrentFolder();
+        }
         return false;
       }
     }
@@ -320,6 +324,7 @@ FileSelector::FileSelector(FileSelectorType type)
   goBackButton()->setFocusStop(false);
   goForwardButton()->setFocusStop(false);
   goUpButton()->setFocusStop(false);
+  refreshButton()->setFocusStop(false);
   newFolderButton()->setFocusStop(false);
   viewType()->setFocusStop(false);
   for (auto child : viewType()->children())
@@ -338,6 +343,7 @@ FileSelector::FileSelector(FileSelectorType type)
   goBackButton()->Click.connect([this]{ onGoBack(); });
   goForwardButton()->Click.connect([this]{ onGoForward(); });
   goUpButton()->Click.connect([this]{ onGoUp(); });
+  refreshButton()->Click.connect([this] { onRefreshFolder(); });
   newFolderButton()->Click.connect([this]{ onNewFolder(); });
   viewType()->ItemChange.connect([this]{ onChangeViewType(); });
   location()->CloseListBox.connect([this]{ onLocationCloseListBox(); });
@@ -373,6 +379,8 @@ void FileSelector::goUp()
 
 void FileSelector::goInsideFolder()
 {
+  refresh();
+
   if (m_fileList->selectedFileItem() &&
       m_fileList->selectedFileItem()->isBrowsable()) {
     m_fileList->setCurrentFolder(
@@ -380,6 +388,11 @@ void FileSelector::goInsideFolder()
   }
 }
 
+void FileSelector::refreshCurrentFolder()
+{
+  onRefreshFolder();
+}
+
 bool FileSelector::show(
   const std::string& title,
   const std::string& initialPath,
@@ -801,6 +814,7 @@ void FileSelector::addInNavigationHistory(IFileItem* folder)
 
 void FileSelector::onGoBack()
 {
+  refresh();
   if (navigation_history.size() > 1) {
     // The default navigation position is at the end of the history
     if (navigation_position.is_null())
@@ -827,6 +841,7 @@ void FileSelector::onGoBack()
 
 void FileSelector::onGoForward()
 {
+  refresh();
   if (navigation_history.size() > 1) {
     // This should not happen, because the forward button should be
     // disabled when the navigation position is null.
@@ -856,9 +871,16 @@ void FileSelector::onGoForward()
 
 void FileSelector::onGoUp()
 {
+  refresh();
   m_fileList->goUp();
 }
 
+void FileSelector::onRefreshFolder()
+{
+  refresh();
+  m_fileList->setCurrentFolder(*navigation_position.get());
+}
+
 void FileSelector::onNewFolder()
 {
   app::gen::NewFolderWindow window;
@@ -890,6 +912,7 @@ void FileSelector::onNewFolder()
 
 void FileSelector::onChangeViewType()
 {
+  onRefreshFolder();
   double newZoom = m_fileList->zoom();
   switch (viewType()->selectedItem()) {
     case 0: newZoom = 1.0; break;
@@ -931,6 +954,7 @@ void FileSelector::onLocationCloseListBox()
 // change the file-extension in the 'filename' entry widget
 void FileSelector::onFileTypeChange()
 {
+  refresh();
   base::paths exts;
   auto* selExtItem = dynamic_cast<CustomFileExtensionItem*>(fileType()->getSelectedItem());
   if (selExtItem)
@@ -1001,4 +1025,11 @@ std::string FileSelector::getSelectedExtension() const
     return m_defExtension;
 }
 
+void FileSelector::refresh()
+{
+  FileSystemModule *fs = FileSystemModule::instance();
+  LockFS lock(fs);
+  fs->refresh();
+}
+
 } // namespace app
diff --git a/src/app/ui/file_selector.h b/src/app/ui/file_selector.h
index 385d86b11..2bb7e5dcc 100644
--- a/src/app/ui/file_selector.h
+++ b/src/app/ui/file_selector.h
@@ -37,6 +37,7 @@ namespace app {
     void goForward();
     void goUp();
     void goInsideFolder();
+    void refreshCurrentFolder();
 
     // Shows the dialog to select a file in the program.
     bool show(const std::string& title,
@@ -58,7 +59,9 @@ namespace app {
     void onFileListFileSelected();
     void onFileListFileAccepted();
     void onFileListCurrentFolderChanged();
+    void onRefreshFolder();
     std::string getSelectedExtension() const;
+    void refresh();
 
     class ArrowNavigator;
     class CustomFileNameItem;

From ea47f6624f49d672a24eca6ea1e280d00a16dbeb Mon Sep 17 00:00:00 2001
From: David Capello <david@igarastudio.com>
Date: Tue, 26 Apr 2022 09:45:38 -0300
Subject: [PATCH 02/17] Update IXWebSocket module

---
 .gitmodules             | 2 +-
 third_party/IXWebSocket | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 920ae4117..3449c869e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -71,4 +71,4 @@
 	url = https://github.com/aseprite/curl.git
 [submodule "third_party/IXWebSocket"]
 	path = third_party/IXWebSocket
-	url = https://github.com/machinezone/IXWebSocket
+	url = https://github.com/aseprite/IXWebSocket.git
diff --git a/third_party/IXWebSocket b/third_party/IXWebSocket
index 9bbd1f1b3..b6f36191c 160000
--- a/third_party/IXWebSocket
+++ b/third_party/IXWebSocket
@@ -1 +1 @@
-Subproject commit 9bbd1f1b30bfa6fb52bf1388ab336ef39d0faead
+Subproject commit b6f36191c2022f5936f272da82dcaa36b9114918

From f638b5ca2b52f7308fa6e3c161309bba4c3fa363 Mon Sep 17 00:00:00 2001
From: David Capello <david@igarastudio.com>
Date: Tue, 26 Apr 2022 12:16:31 -0300
Subject: [PATCH 03/17] Fix minor memory leak loading a doc::Palette from
 backup data

---
 src/app/crash/read_document.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/app/crash/read_document.cpp b/src/app/crash/read_document.cpp
index c312c06e4..fd41c45f3 100644
--- a/src/app/crash/read_document.cpp
+++ b/src/app/crash/read_document.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2020  Igara Studio S.A.
+// Copyright (C) 2018-2022  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -308,9 +308,10 @@ private:
           return nullptr;
 
         ObjectId palId = read32(s);
-        Palette* pal = loadObject<Palette*>("pal", palId, &Reader::readPalette);
+        std::unique_ptr<Palette> pal(
+          loadObject<Palette*>("pal", palId, &Reader::readPalette));
         if (pal)
-          spr->setPalette(pal, true);
+          spr->setPalette(pal.get(), true);
       }
     }
 

From 94065571b575d13a31b4ed3c967020ac4523f693 Mon Sep 17 00:00:00 2001
From: David Capello <david@igarastudio.com>
Date: Thu, 28 Apr 2022 16:32:09 -0300
Subject: [PATCH 04/17] [x11] Add possibility to set a user-defined string to
 detect styluses (#3176)

---
 data/pref.xml   |  1 +
 laf             |  2 +-
 src/app/app.cpp | 16 ++++++++++++++--
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/data/pref.xml b/data/pref.xml
index 26f4796d6..98ea133ba 100644
--- a/data/pref.xml
+++ b/data/pref.xml
@@ -158,6 +158,7 @@
       <option id="show_menu_bar" type="bool" default="true" />
       <option id="recent_items" type="int" default="16" />
       <option id="osx_async_view" type="bool" default="true" />
+      <option id="x11_stylus_id" type="std::string" />
     </section>
     <section id="undo" text="Undo">
       <option id="size_limit" type="int" default="0" />
diff --git a/laf b/laf
index df53f4ac0..8f9e7892e 160000
--- a/laf
+++ b/laf
@@ -1 +1 @@
-Subproject commit df53f4ac0cecada789bf84b4283947d2591833bd
+Subproject commit 8f9e7892e0da31e423e224b199f53d8ffefce32b
diff --git a/src/app/app.cpp b/src/app/app.cpp
index a78141cf3..c490e278f 100644
--- a/src/app/app.cpp
+++ b/src/app/app.cpp
@@ -71,6 +71,8 @@
 
 #if LAF_MACOS
   #include "os/osx/system.h"
+#elif LAF_LINUX
+  #include "os/x11/system.h"
 #endif
 
 #include <iostream>
@@ -236,6 +238,7 @@ int App::initialize(const AppOptions& options)
   m_coreModules = new CoreModules;
 
 #if LAF_WINDOWS
+
   if (options.disableWintab() ||
       !preferences().experimental.loadWintabDriver() ||
       preferences().tablet.api() == "pointer") {
@@ -245,11 +248,20 @@ int App::initialize(const AppOptions& options)
     system->setTabletAPI(os::TabletAPI::WintabPackets);
   else // preferences().tablet.api() == "wintab"
     system->setTabletAPI(os::TabletAPI::Wintab);
-#endif
 
-#if LAF_MACOS
+#elif LAF_MACOS
+
   if (!preferences().general.osxAsyncView())
     os::osx_set_async_view(false);
+
+#elif LAF_LINUX
+
+  {
+    const std::string& stylusId = preferences().general.x11StylusId();
+    if (!stylusId.empty())
+      os::x11_set_user_defined_string_to_detect_stylus(stylusId);
+  }
+
 #endif
 
   system->setAppName(get_app_name());

From cc7da166910e8be5eb29e4e84bf9aadc7cc7b22b Mon Sep 17 00:00:00 2001
From: David Capello <david@igarastudio.com>
Date: Thu, 28 Apr 2022 21:58:15 -0300
Subject: [PATCH 05/17] Run Console in background so commands can continue
 running and logging to the console if needed (fix #3227)

---
 src/app/app.cpp     |   5 +-
 src/app/console.cpp | 124 ++++++++++++++++++++++++++++++++++++--------
 src/app/console.h   |   6 +--
 src/ui/window.cpp   |   4 +-
 src/ui/window.h     |  10 ++++
 5 files changed, 119 insertions(+), 30 deletions(-)

diff --git a/src/app/app.cpp b/src/app/app.cpp
index c490e278f..2c02593a2 100644
--- a/src/app/app.cpp
+++ b/src/app/app.cpp
@@ -97,6 +97,7 @@ namespace {
 
 class ConsoleEngineDelegate : public script::EngineDelegate {
 public:
+  ConsoleEngineDelegate(Console& console) : m_console(console) { }
   void onConsoleError(const char* text) override {
     onConsolePrint(text);
   }
@@ -104,7 +105,7 @@ public:
     m_console.printf("%s\n", text);
   }
 private:
-  Console m_console;
+  Console& m_console;
 };
 
 } // anonymous namespace
@@ -497,7 +498,7 @@ void App::run()
     Console console;
 #ifdef ENABLE_SCRIPTING
     // Use the app::Console() for script errors
-    ConsoleEngineDelegate delegate;
+    ConsoleEngineDelegate delegate(console);
     script::ScopedEngineDelegate setEngineDelegate(m_engine.get(), &delegate);
 #endif
 
diff --git a/src/app/console.cpp b/src/app/console.cpp
index 3408edd6d..8904d805f 100644
--- a/src/app/console.cpp
+++ b/src/app/console.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2021  Igara Studio S.A.
+// Copyright (C) 2018-2022  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -14,32 +14,50 @@
 #include "app/app.h"
 #include "app/context.h"
 #include "app/modules/gui.h"
+#include "app/ui/main_window.h"
 #include "app/ui/status_bar.h"
 #include "base/memory.h"
 #include "base/string.h"
 #include "ui/system.h"
 #include "ui/ui.h"
 
-
 #include <cstdarg>
 #include <cstdio>
 #include <memory>
 
+#define TRACE_CON(...) // TRACEARGS(__VA_ARGS__)
+
 namespace app {
 
 using namespace ui;
 
-class Console::ConsoleWindow : public Window {
+Console::ConsoleWindow* Console::m_console = nullptr;
+
+class Console::ConsoleWindow final : public Window {
 public:
   ConsoleWindow() : Window(Window::WithTitleBar, "Console"),
                     m_textbox("", WORDWRAP),
                     m_button("Cancel") {
+    TRACE_CON("CON: ConsoleWindow this=", this);
+
     m_button.Click.connect([this]{ closeWindow(&m_button); });
 
+    // When the main window is closed, we should close the console (in
+    // other case the main message loop will continue running for the
+    // console too).
+    m_mainWindowClosedConn =
+      App::instance()->mainWindow()->Close.connect(
+        [this]{ closeWindow(nullptr); });
+
     // When the window is closed, we clear the text
     Close.connect(
       [this]{
+        m_mainWindowClosedConn.disconnect();
         m_textbox.setText(std::string());
+
+        Console::m_console->deferDelete();
+        Console::m_console = nullptr;
+        TRACE_CON("CON: Close signal");
       });
 
     m_view.attachToView(&m_textbox);
@@ -56,17 +74,33 @@ public:
     initTheme();
   }
 
+  ~ConsoleWindow() {
+    TRACE_CON("CON: ~ConsoleWindow this=", this);
+  }
+
   void addMessage(const std::string& msg) {
     if (!m_hasText) {
       m_hasText = true;
       centerConsole();
     }
 
+    gfx::Size maxSize = m_view.getScrollableSize();
+    gfx::Size visible = m_view.visibleSize();
+    gfx::Point pt = m_view.viewScroll();
+    const bool autoScroll = (pt.y >= maxSize.h - visible.h);
+
     m_textbox.setText(m_textbox.text() + msg);
+
+    if (autoScroll) {
+      maxSize = m_view.getScrollableSize();
+      visible = m_view.visibleSize();
+      pt.y = maxSize.h - visible.h;
+      m_view.setViewScroll(pt);
+    }
   }
 
-  bool isConsoleVisible() const {
-    return (m_hasText && isVisible());
+  bool hasConsoleText() const {
+    return m_hasText;
   }
 
   void centerConsole() {
@@ -78,19 +112,66 @@ public:
   }
 
 private:
+  // As Esc key activates the close button only on foreground windows,
+  // we have to override this method to allow pressing the window
+  // close button using Esc key even in this window (which runs in the
+  // background).
+  bool shouldProcessEscKeyToCloseWindow() const override {
+    return true;
+  }
+
   bool onProcessMessage(ui::Message* msg) override {
     switch (msg->type()) {
 
-      case ui::kKeyDownMessage:
+      case ui::kKeyDownMessage: {
+        auto scancode = static_cast<KeyMessage*>(msg)->scancode();
+
 #if defined __APPLE__
         if (msg->onlyCmdPressed())
 #else
         if (msg->onlyCtrlPressed())
 #endif
         {
-          if (static_cast<KeyMessage*>(msg)->scancode() == kKeyC)
+          if (scancode == kKeyC)
             set_clipboard_text(m_textbox.text());
         }
+
+        // Esc to close the window.
+        if (auto closeButton = this->closeButton()) {
+          bool p = msg->propagateToParent();
+          msg->setPropagateToParent(false);
+
+          if (closeButton->sendMessage(msg))
+            return true;
+
+          msg->setPropagateToParent(p);
+        }
+
+        // Send Enter key to the Close button, Tab to change focus
+        if ((scancode == kKeyEnter) ||
+            (scancode == kKeyEnterPad))
+          return m_button.sendMessage(msg);
+
+        if (scancode == kKeyTab) {
+          if (auto mgr = manager())
+            return mgr->processFocusMovementMessage(msg);
+        }
+
+        // All keys are used if we have this window focused (so they
+        // don't trigger commands)
+        return true;
+      }
+
+      case ui::kKeyUpMessage:
+        if (auto closeButton = this->closeButton()) {
+          bool p = msg->propagateToParent();
+          msg->setPropagateToParent(false);
+
+          if (closeButton->sendMessage(msg))
+            return true;
+
+          msg->setPropagateToParent(p);
+        }
         break;
     }
     return Window::onProcessMessage(msg);
@@ -102,18 +183,18 @@ private:
     m_button.setMinSize(gfx::Size(60*ui::guiscale(), 0));
   }
 
+  obs::scoped_connection m_mainWindowClosedConn;
   View m_view;
   TextBox m_textbox;
   Button m_button;
   bool m_hasText = false;
 };
 
-int Console::m_consoleCounter = 0;
-std::unique_ptr<Console::ConsoleWindow> Console::m_console = nullptr;
-
 Console::Console(Context* ctx)
   : m_withUI(false)
 {
+  TRACE_CON("CON: Console this=", this, "ctx=", ctx, "is_ui_thread=", ui::is_ui_thread(), "{");
+
   if (!ui::is_ui_thread())
     return;
 
@@ -129,27 +210,26 @@ Console::Console(Context* ctx)
   if (!m_withUI)
     return;
 
-  ++m_consoleCounter;
-  if (m_console || m_consoleCounter > 1)
-    return;
+  TRACE_CON("CON: -> withUI=", m_withUI);
 
-  m_console.reset(new ConsoleWindow);
+  if (!m_console)
+    m_console = new ConsoleWindow;
 }
 
 Console::~Console()
 {
+  TRACE_CON("CON: } ~Console this=", this, "withUI=", m_withUI);
+
   if (!m_withUI)
     return;
 
-  --m_consoleCounter;
-
-  if (m_console && m_console->isConsoleVisible()) {
-    m_console->manager()->attractFocus(m_console.get());
-    m_console->openWindowInForeground();
+  if (m_console &&
+      m_console->hasConsoleText() &&
+      !m_console->isVisible()) {
+    m_console->manager()->attractFocus(m_console);
+    m_console->openWindow();
+    TRACE_CON("CON: openWindow");
   }
-
-  if (m_consoleCounter == 0)
-    m_console.reset();
 }
 
 void Console::printf(const char* format, ...)
diff --git a/src/app/console.h b/src/app/console.h
index 218374a1f..ce13a827c 100644
--- a/src/app/console.h
+++ b/src/app/console.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2020  Igara Studio S.A.
+// Copyright (C) 2018-2022  Igara Studio S.A.
 // Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
@@ -10,7 +10,6 @@
 #pragma once
 
 #include <exception>
-#include <memory>
 
 namespace app {
   class Context;
@@ -29,8 +28,7 @@ namespace app {
     class ConsoleWindow;
 
     bool m_withUI;
-    static int m_consoleCounter;
-    static std::unique_ptr<Console::ConsoleWindow> m_console;
+    static ConsoleWindow* m_console;
   };
 
 } // namespace app
diff --git a/src/ui/window.cpp b/src/ui/window.cpp
index 5015e31a1..57837840b 100644
--- a/src/ui/window.cpp
+++ b/src/ui/window.cpp
@@ -80,7 +80,7 @@ protected:
         return true;
 
       case kKeyDownMessage:
-        if (window()->isForeground() &&
+        if (window()->shouldProcessEscKeyToCloseWindow() &&
             static_cast<KeyMessage*>(msg)->scancode() == kKeyEsc) {
           setSelected(true);
           return true;
@@ -88,7 +88,7 @@ protected:
         break;
 
       case kKeyUpMessage:
-        if (window()->isForeground() &&
+        if (window()->shouldProcessEscKeyToCloseWindow() &&
             static_cast<KeyMessage*>(msg)->scancode() == kKeyEsc) {
           if (isSelected()) {
             setSelected(false);
diff --git a/src/ui/window.h b/src/ui/window.h
index 2da44dc30..4737430d6 100644
--- a/src/ui/window.h
+++ b/src/ui/window.h
@@ -1,4 +1,5 @@
 // Aseprite UI Library
+// Copyright (C) 2022  Igara Studio S.A.
 // Copyright (C) 2001-2017  David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -54,10 +55,19 @@ namespace ui {
 
     HitTest hitTest(const gfx::Point& point);
 
+    // Esc key closes the current window (presses the little close
+    // button decorator) only on foreground windows, but you can
+    // override this to allow this behavior in other kind of windows.
+    virtual bool shouldProcessEscKeyToCloseWindow() const {
+      return isForeground();
+    }
+
     // Signals
     obs::signal<void (CloseEvent&)> Close;
 
   protected:
+    ButtonBase* closeButton() { return m_closeButton; }
+
     virtual bool onProcessMessage(Message* msg) override;
     virtual void onResize(ResizeEvent& ev) override;
     virtual void onSizeHint(SizeHintEvent& ev) override;

From dfa357eb8d30bd35edd12bebca4aafc6d5e65d80 Mon Sep 17 00:00:00 2001
From: David Capello <david@igarastudio.com>
Date: Fri, 29 Apr 2022 09:53:57 -0300
Subject: [PATCH 06/17] Add an experimental CommandResult for the execution of
 commands

This makes possible to return true or false after the execution of
each command app.command.CommandName() if it successes or fails.
Currently the Lua API documentation says something about this here:

  https://github.com/aseprite/api/blob/main/api/command/ReplaceColor.md#replacecolor

But this is not true, the function always returned nil. Now it will
return true or false.
---
 .../commands/filters/filter_manager_impl.cpp  | 11 +++++++-
 src/app/commands/filters/filter_worker.cpp    |  1 -
 src/app/context.cpp                           | 15 ++++++++++-
 src/app/context.h                             | 26 ++++++++++++++++++-
 src/app/script/app_command_object.cpp         | 11 +++++++-
 5 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/src/app/commands/filters/filter_manager_impl.cpp b/src/app/commands/filters/filter_manager_impl.cpp
index 77bc7106a..1bfc201bc 100644
--- a/src/app/commands/filters/filter_manager_impl.cpp
+++ b/src/app/commands/filters/filter_manager_impl.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019-2021  Igara Studio S.A.
+// Copyright (C) 2019-2022  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -205,6 +205,7 @@ bool FilterManagerImpl::applyStep()
 
 void FilterManagerImpl::apply()
 {
+  CommandResult result;
   bool cancelled = false;
 
   begin();
@@ -239,7 +240,15 @@ void FilterManagerImpl::apply()
             position()));
       }
     }
+
+    result = CommandResult(CommandResult::kOk);
   }
+  else {
+    result = CommandResult(CommandResult::kCanceled);
+  }
+
+  ASSERT(m_reader.context());
+  m_reader.context()->setCommandResult(result);
 }
 
 void FilterManagerImpl::applyToTarget()
diff --git a/src/app/commands/filters/filter_worker.cpp b/src/app/commands/filters/filter_worker.cpp
index e0ef40317..bd2e1fdbe 100644
--- a/src/app/commands/filters/filter_worker.cpp
+++ b/src/app/commands/filters/filter_worker.cpp
@@ -12,7 +12,6 @@
 #include "app/app.h"
 #include "app/commands/filters/filter_manager_impl.h"
 #include "app/console.h"
-#include "app/context_access.h"
 #include "app/i18n/strings.h"
 #include "app/ini_file.h"
 #include "app/modules/editors.h"
diff --git a/src/app/context.cpp b/src/app/context.cpp
index 1e5bb74a1..0726c09ce 100644
--- a/src/app/context.cpp
+++ b/src/app/context.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2021  Igara Studio S.A.
+// Copyright (C) 2018-2022  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -143,6 +143,8 @@ void Context::executeCommand(Command* command, const Params& params)
   if (!command)
     return;
 
+  m_result.reset();
+
   Console console;
   LOG(VERBOSE, "CTXT: Executing command %s\n", command->id().c_str());
   try {
@@ -177,17 +179,23 @@ void Context::executeCommand(Command* command, const Params& params)
       app_rebuild_documents_tabs();
   }
   catch (base::Exception& e) {
+    m_result = CommandResult(CommandResult::kError);
+
     LOG(ERROR, "CTXT: Exception caught executing %s command\n%s\n",
         command->id().c_str(), e.what());
     Console::showException(e);
   }
   catch (std::exception& e) {
+    m_result = CommandResult(CommandResult::kError);
+
     LOG(ERROR, "CTXT: std::exception caught executing %s command\n%s\n",
         command->id().c_str(), e.what());
     console.printf("An error ocurred executing the command.\n\nDetails:\n%s", e.what());
   }
 #ifdef NDEBUG
   catch (...) {
+    m_result = CommandResult(CommandResult::kError);
+
     LOG(ERROR, "CTXT: Unknown exception executing %s command\n",
         command->id().c_str());
 
@@ -200,6 +208,11 @@ void Context::executeCommand(Command* command, const Params& params)
 #endif
 }
 
+void Context::setCommandResult(const CommandResult& result)
+{
+  m_result = result;
+}
+
 void Context::onAddDocument(Doc* doc)
 {
   m_lastSelectedDoc = doc;
diff --git a/src/app/context.h b/src/app/context.h
index 14cbc6e39..b8f053bb7 100644
--- a/src/app/context.h
+++ b/src/app/context.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2021  Igara Studio S.A.
+// Copyright (C) 2018-2022  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -36,6 +36,24 @@ namespace app {
   class DocView;
   class Preferences;
 
+  class CommandResult {
+  public:
+    enum Type {
+      kOk,
+      // Exception throw (e.g. cannot lock sprite)
+      kError,
+      // Canceled by user.
+      kCanceled,
+    };
+
+    CommandResult(Type type = Type::kOk) : m_type(type) { }
+    Type type() const { return m_type; }
+    void reset() { m_type = Type::kOk; }
+
+  private:
+    Type m_type;
+  };
+
   class CommandPreconditionException : public base::Exception {
   public:
     CommandPreconditionException() throw()
@@ -97,6 +115,9 @@ namespace app {
     void executeCommandFromMenuOrShortcut(Command* command, const Params& params = Params());
     virtual void executeCommand(Command* command, const Params& params = Params());
 
+    void setCommandResult(const CommandResult& result);
+    const CommandResult& commandResult() { return m_result; }
+
     virtual DocView* getFirstDocView(Doc* document) const {
       return nullptr;
     }
@@ -130,6 +151,9 @@ namespace app {
     Doc* m_lastSelectedDoc;
     mutable std::unique_ptr<Preferences> m_preferences;
 
+    // Result of the execution of a command.
+    CommandResult m_result;
+
     DISABLE_COPYING(Context);
   };
 
diff --git a/src/app/script/app_command_object.cpp b/src/app/script/app_command_object.cpp
index 0d65a9b53..1493930f4 100644
--- a/src/app/script/app_command_object.cpp
+++ b/src/app/script/app_command_object.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019  Igara Studio S.A.
+// Copyright (C) 2019-2022  Igara Studio S.A.
 // Copyright (C) 2018  David Capello
 //
 // This program is distributed under the terms of
@@ -52,6 +52,15 @@ int Command_call(lua_State* L)
   }
 
   ctx->executeCommand(command, params);
+
+  if (ctx->commandResult().type() == CommandResult::kOk) {
+    lua_pushboolean(L, true);
+  }
+  else {
+    // TODO rollback/cancel the whole current transaction?
+    //      or just throw an luaL_error()?
+    lua_pushboolean(L, false);
+  }
   return 1;
 }
 

From d861f0760cb0ec4b0135ffdd5a937585bcb8125c Mon Sep 17 00:00:00 2001
From: David Capello <david@igarastudio.com>
Date: Fri, 29 Apr 2022 10:01:23 -0300
Subject: [PATCH 07/17] Switch from C++14 to C++17 (#2999)

---
 CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c2dbc5ee5..155be8495 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Aseprite
-# Copyright (C) 2018-2021  Igara Studio S.A.
+# Copyright (C) 2018-2022  Igara Studio S.A.
 # Copyright (C) 2001-2018  David Capello
 
 cmake_minimum_required(VERSION 3.4)
 
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF) # We use -std=c++14 instead of -std=gnu++14 in macOS
+set(CMAKE_CXX_EXTENSIONS OFF) # We use -std=c++17 instead of -std=gnu++17 in macOS
 
 if(COMMAND cmake_policy)
   # CMP0003: Libraries linked via full path no longer produce linker search paths.

From f41c6bc1c51b64f406836834c1ade77fcac82b1f Mon Sep 17 00:00:00 2001
From: David Capello <david@igarastudio.com>
Date: Tue, 3 May 2022 15:11:47 -0300
Subject: [PATCH 08/17] Fix compilation in macOS (and add Command+R to refresh)

---
 src/app/ui/file_selector.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/app/ui/file_selector.cpp b/src/app/ui/file_selector.cpp
index f1be02bc0..b878c7012 100644
--- a/src/app/ui/file_selector.cpp
+++ b/src/app/ui/file_selector.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019-2020  Igara Studio S.A.
+// Copyright (C) 2019-2022  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -279,8 +279,10 @@ protected:
         bool enter = (msg->altPressed() && scancode == kKeyDown);
         bool back = (msg->altPressed() && scancode == kKeyLeft);
         bool forward = (msg->altPressed() && scancode == kKeyRight);
-        bool refresh = (scancode == kKeyF5 || (msg->ctrlPressed() && scancode == kKeyR));
 #endif
+        bool refresh = (scancode == kKeyF5 ||
+                        (msg->ctrlPressed() && scancode == kKeyR) ||
+                        (msg->cmdPressed() && scancode == kKeyR));
 
         if (up) {
           m_filesel->goUp();

From debd22014c44d94e4eab8d8a4ae1a8af090c0121 Mon Sep 17 00:00:00 2001
From: David Capello <david@igarastudio.com>
Date: Tue, 3 May 2022 15:14:44 -0300
Subject: [PATCH 09/17] Fix program hanging when calling
 FileSelector::refresh()

The FileSystemModule is already locked, so if we use LockFS another
time it will try to lock a FileSystemModule::m_mutex for a second
time.
---
 src/app/ui/file_selector.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/ui/file_selector.cpp b/src/app/ui/file_selector.cpp
index b878c7012..7343fbad3 100644
--- a/src/app/ui/file_selector.cpp
+++ b/src/app/ui/file_selector.cpp
@@ -1030,7 +1030,6 @@ std::string FileSelector::getSelectedExtension() const
 void FileSelector::refresh()
 {
   FileSystemModule *fs = FileSystemModule::instance();
-  LockFS lock(fs);
   fs->refresh();
 }
 

From db84c02e942a58e1bd92c131a7d86e7921047356 Mon Sep 17 00:00:00 2001
From: David Capello <david@igarastudio.com>
Date: Tue, 3 May 2022 15:17:18 -0300
Subject: [PATCH 10/17] Fix crash accessing an invalid iterator in
 FileSelector::onRefreshFolder()

---
 src/app/ui/file_selector.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/ui/file_selector.cpp b/src/app/ui/file_selector.cpp
index 7343fbad3..fe83e828c 100644
--- a/src/app/ui/file_selector.cpp
+++ b/src/app/ui/file_selector.cpp
@@ -880,7 +880,7 @@ void FileSelector::onGoUp()
 void FileSelector::onRefreshFolder()
 {
   refresh();
-  m_fileList->setCurrentFolder(*navigation_position.get());
+  m_fileList->setCurrentFolder(m_fileList->currentFolder());
 }
 
 void FileSelector::onNewFolder()

From 9248f534470044d5a73eb8ffdd966120bbdaf006 Mon Sep 17 00:00:00 2001
From: David Capello <david@igarastudio.com>
Date: Tue, 3 May 2022 15:46:01 -0300
Subject: [PATCH 11/17] Don't invalidate the cached file system on each action

We can use the refresh button for this, and in a future we could
refresh it when the window loses focus and is activated again, or
listening the file system changes.
---
 src/app/ui/file_selector.cpp | 17 +++--------------
 src/app/ui/file_selector.h   |  1 -
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/app/ui/file_selector.cpp b/src/app/ui/file_selector.cpp
index fe83e828c..9729e6389 100644
--- a/src/app/ui/file_selector.cpp
+++ b/src/app/ui/file_selector.cpp
@@ -381,8 +381,6 @@ void FileSelector::goUp()
 
 void FileSelector::goInsideFolder()
 {
-  refresh();
-
   if (m_fileList->selectedFileItem() &&
       m_fileList->selectedFileItem()->isBrowsable()) {
     m_fileList->setCurrentFolder(
@@ -816,7 +814,6 @@ void FileSelector::addInNavigationHistory(IFileItem* folder)
 
 void FileSelector::onGoBack()
 {
-  refresh();
   if (navigation_history.size() > 1) {
     // The default navigation position is at the end of the history
     if (navigation_position.is_null())
@@ -843,7 +840,6 @@ void FileSelector::onGoBack()
 
 void FileSelector::onGoForward()
 {
-  refresh();
   if (navigation_history.size() > 1) {
     // This should not happen, because the forward button should be
     // disabled when the navigation position is null.
@@ -873,13 +869,14 @@ void FileSelector::onGoForward()
 
 void FileSelector::onGoUp()
 {
-  refresh();
   m_fileList->goUp();
 }
 
 void FileSelector::onRefreshFolder()
 {
-  refresh();
+  auto fs = FileSystemModule::instance();
+  fs->refresh();
+
   m_fileList->setCurrentFolder(m_fileList->currentFolder());
 }
 
@@ -914,7 +911,6 @@ void FileSelector::onNewFolder()
 
 void FileSelector::onChangeViewType()
 {
-  onRefreshFolder();
   double newZoom = m_fileList->zoom();
   switch (viewType()->selectedItem()) {
     case 0: newZoom = 1.0; break;
@@ -956,7 +952,6 @@ void FileSelector::onLocationCloseListBox()
 // change the file-extension in the 'filename' entry widget
 void FileSelector::onFileTypeChange()
 {
-  refresh();
   base::paths exts;
   auto* selExtItem = dynamic_cast<CustomFileExtensionItem*>(fileType()->getSelectedItem());
   if (selExtItem)
@@ -1027,10 +1022,4 @@ std::string FileSelector::getSelectedExtension() const
     return m_defExtension;
 }
 
-void FileSelector::refresh()
-{
-  FileSystemModule *fs = FileSystemModule::instance();
-  fs->refresh();
-}
-
 } // namespace app
diff --git a/src/app/ui/file_selector.h b/src/app/ui/file_selector.h
index 2bb7e5dcc..00da7ff1e 100644
--- a/src/app/ui/file_selector.h
+++ b/src/app/ui/file_selector.h
@@ -61,7 +61,6 @@ namespace app {
     void onFileListCurrentFolderChanged();
     void onRefreshFolder();
     std::string getSelectedExtension() const;
-    void refresh();
 
     class ArrowNavigator;
     class CustomFileNameItem;

From c7827410bd1b109f12180564a6aa19c270e27b2d Mon Sep 17 00:00:00 2001
From: David Capello <david@igarastudio.com>
Date: Tue, 3 May 2022 15:50:05 -0300
Subject: [PATCH 12/17] Move the refresh button at the right of the file
 selector

---
 data/widgets/file_selector.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/widgets/file_selector.xml b/data/widgets/file_selector.xml
index 8b16b7a16..fd1c90aa7 100644
--- a/data/widgets/file_selector.xml
+++ b/data/widgets/file_selector.xml
@@ -1,5 +1,5 @@
 <!-- Aseprite -->
-<!-- Copyright (C) 2019  Igara Studio S.A. -->
+<!-- Copyright (C) 2019-2022  Igara Studio S.A. -->
 <!-- Copyright (C) 2001-2018  David Capello -->
 <gui>
   <window id="file_selector" text="">
@@ -13,8 +13,6 @@
       </hbox>
       <button text="" id="go_up_button" style="go_up_button"
               tooltip="@.go_up_button_tooltip" tooltip_dir="bottom" />
-      <button text="" id="refresh_button" style="refresh_button"
-                tooltip="@.refresh_button_tooltip" tooltip_dir="bottom" />
       <button text="" id="new_folder_button" style="new_folder_button"
               tooltip="@.new_folder_button_tooltip" tooltip_dir="bottom" />
       <buttonset id="view_type" columns="3">
@@ -23,6 +21,8 @@
         <item icon="big_icon_view" tooltip="@.big_icon_view_button_tooltip" tooltip_dir="bottom" />
       </buttonset>
       <combobox id="location" expansive="true" />
+      <button text="" id="refresh_button" style="refresh_button"
+                tooltip="@.refresh_button_tooltip" tooltip_dir="bottom" />
     </box>
     <vbox id="file_view_placeholder" expansive="true" />
     <grid columns="2">

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 13/17] 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

From 2a00d41e953f157f984f4ed5e18a589cf272dc57 Mon Sep 17 00:00:00 2001
From: Thanos Kamber <36815670+TehThanos@users.noreply.github.com>
Date: Fri, 7 May 2021 02:31:07 +0300
Subject: [PATCH 14/17] Changed the default behaviour in Windows and Linux

This commit makes the default behaviour for changing the brush size to
be scroll up to increase brush size, this should already be the case
in macOS.

Note: It's correct in Windows and Linux, but I don't have a mac to test
it with.
---
 src/app/ui/editor/state_with_wheel_behavior.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/app/ui/editor/state_with_wheel_behavior.cpp b/src/app/ui/editor/state_with_wheel_behavior.cpp
index 73bc08763..9d70c8331 100644
--- a/src/app/ui/editor/state_with_wheel_behavior.cpp
+++ b/src/app/ui/editor/state_with_wheel_behavior.cpp
@@ -190,6 +190,10 @@ bool StateWithWheelBehavior::onMouseWheel(Editor* editor, MouseMessage* msg)
       ToolPreferences::Brush& brush =
         Preferences::instance().tool(tool).brush;
 
+#if defined(_WIN32) || defined(__linux__)
+      dz = -dz;
+#endif
+
       int newBrushSize;
       if (Preferences::instance().editor.invertBrushSizeScroll())
         newBrushSize = int(brush.size()-dz);

From 04903692f9f32070bf9b6a4bc7931014fd188e04 Mon Sep 17 00:00:00 2001
From: David Capello <david@igarastudio.com>
Date: Thu, 5 May 2022 09:15:00 -0300
Subject: [PATCH 15/17] Add some comments & simplify code handling
 WheelAction::BrushSize

---
 src/app/ui/editor/state_with_wheel_behavior.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/app/ui/editor/state_with_wheel_behavior.cpp b/src/app/ui/editor/state_with_wheel_behavior.cpp
index 9d70c8331..258cb47ff 100644
--- a/src/app/ui/editor/state_with_wheel_behavior.cpp
+++ b/src/app/ui/editor/state_with_wheel_behavior.cpp
@@ -191,18 +191,20 @@ bool StateWithWheelBehavior::onMouseWheel(Editor* editor, MouseMessage* msg)
         Preferences::instance().tool(tool).brush;
 
 #if defined(_WIN32) || defined(__linux__)
+      // By default on macOS the mouse wheel is correct, up increase
+      // brush size, and down decrease it. But on Windows and Linux
+      // it's inverted.
       dz = -dz;
 #endif
 
-      int newBrushSize;
+      // We can configure the mouse wheel for brush size to behave as
+      // in previous versions.
       if (Preferences::instance().editor.invertBrushSizeScroll())
-        newBrushSize = int(brush.size()-dz);
-      else
-        newBrushSize = int(brush.size()+dz);
+        dz = -dz;
 
       brush.size(
         base::clamp(
-          newBrushSize,
+          int(brush.size()+dz),
           // 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

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 16/17] 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(

From adaef68bbbf46286c56acb6d38e62e87dfe23f50 Mon Sep 17 00:00:00 2001
From: David Capello <david@igarastudio.com>
Date: Thu, 5 May 2022 09:39:16 -0300
Subject: [PATCH 17/17] Minor change in macros to detect platform

---
 src/app/ui/editor/state_with_wheel_behavior.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/ui/editor/state_with_wheel_behavior.cpp b/src/app/ui/editor/state_with_wheel_behavior.cpp
index ef27a9bd5..dd79a7213 100644
--- a/src/app/ui/editor/state_with_wheel_behavior.cpp
+++ b/src/app/ui/editor/state_with_wheel_behavior.cpp
@@ -190,7 +190,7 @@ bool StateWithWheelBehavior::onMouseWheel(Editor* editor, MouseMessage* msg)
       ToolPreferences::Brush& brush =
         Preferences::instance().tool(tool).brush;
 
-#if defined(_WIN32) || defined(__linux__)
+#if LAF_WINDOWS || LAF_LINUX
       // By default on macOS the mouse wheel is correct, up increase
       // brush size, and down decrease it. But on Windows and Linux
       // it's inverted.