Merge c98a2056e5 into cef92c1a38

We don't have an Aseprite.app target in cmake files yet, but we might
add it in a near future.

src/CMakeLists.txt

@@ -180,8 +180,8 @@ if(ENABLE_ASEPRITE_EXE)
 
   if(WIN32)
     set(main_resources
-      main/resources_win32.rc
-      main/settings.manifest)
+      main/win/resources_win32.rc
+      main/win/settings.manifest)
   endif()
 
   add_executable(${main_target}

src/app/CMakeLists.txt

@@ -705,6 +705,7 @@ target_sources(app-lib PRIVATE
   util/filetoks.cpp
   util/layer_boundaries.cpp
   util/layer_utils.cpp
+  util/moving_utils.cpp
   util/msk_file.cpp
   util/new_image_from_mask.cpp
   util/open_file_job.cpp

src/app/resource_finder.cpp

@@ -213,7 +213,7 @@ void ResourceFinder::includeDesktopDir(const char* filename)
 #ifdef _WIN32
 
   std::vector<wchar_t> buf(MAX_PATH);
-  HRESULT hr = SHGetFolderPath(NULL, CSIDL_DESKTOPDIRECTORY, NULL, SHGFP_TYPE_DEFAULT, &buf[0]);
+  HRESULT hr = SHGetFolderPath(NULL, CSIDL_DESKTOP, NULL, SHGFP_TYPE_CURRENT, &buf[0]);
   if (hr == S_OK) {
     addPath(base::join_path(base::to_utf8(&buf[0]), filename));
   }

src/app/ui/editor/moving_cel_state.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2020-2023  Igara Studio S.A.
+// Copyright (C) 2020-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -247,14 +247,10 @@ void MovingCelState::onCommitMouseMove(Editor* editor, const gfx::PointF& newCur
       m_celOffset = newCursorPos - m_cursorStart;
       if (int(editor->getCustomizationDelegate()->getPressedKeyAction(
                 KeyContext::TranslatingSelection) &
-              KeyAction::LockAxis)) {
-        if (ABS(m_celOffset.x) < ABS(m_celOffset.y)) {
-          m_celOffset.x = 0;
-        }
-        else {
-          m_celOffset.y = 0;
-        }
-      }
+              KeyAction::LockAxis))
+        app::lockAxis(m_lockedAxis, m_celOffset);
+      else
+        m_lockedAxis = NONE;
       if (!m_moved && intCelOffset() != gfx::Point(0, 0))
         m_moved = true;
       break;

src/app/ui/editor/moving_cel_state.h

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2021-2022 Igara Studio S.A.
+// Copyright (C) 2021-2025 Igara Studio S.A.
 // Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
@@ -14,6 +14,7 @@
 #include "app/context_access.h"
 #include "app/ui/editor/delayed_mouse_move.h"
 #include "app/ui/editor/handle_type.h"
+#include "app/util/moving_utils.h"
 #include "doc/cel_list.h"
 
 #include <vector>
@@ -80,6 +81,7 @@ private:
   gfx::PointF m_celOffset;
   gfx::SizeF m_celMainSize;
   gfx::SizeF m_celScale;
+  LockedAxis m_lockedAxis;
   bool m_maskVisible;
   bool m_hasReference = false;
   bool m_moved = false;

src/app/ui/editor/pixels_movement.cpp

@@ -376,6 +376,7 @@ void PixelsMovement::moveImage(const gfx::PointF& pos, MoveModifier moveModifier
   switch (m_handle) {
     case MovePixelsHandle: {
       double dx, dy;
+      const bool isLockAxis = ((moveModifier & LockAxisMovement) == LockAxisMovement);
       if (tilesModeOn) {
         if (m_catchPos.x == 0 && m_catchPos.y == 0) {
           // Movement through keyboard:
@@ -393,7 +394,8 @@ void PixelsMovement::moveImage(const gfx::PointF& pos, MoveModifier moveModifier
           dy = point.y;
         }
       }
-      else if ((moveModifier & FineControl) == 0) {
+      // FineControl is discarded if 'Locked Axis' is active
+      else if (isLockAxis || ((moveModifier & FineControl) == 0)) {
         dx = (std::floor(pos.x) - std::floor(m_catchPos.x));
         dy = (std::floor(pos.y) - std::floor(m_catchPos.y));
       }
@@ -402,12 +404,10 @@ void PixelsMovement::moveImage(const gfx::PointF& pos, MoveModifier moveModifier
         dy = (pos.y - m_catchPos.y);
       }
 
-      if ((moveModifier & LockAxisMovement) == LockAxisMovement) {
-        if (std::abs(dx) < std::abs(dy))
-          dx = 0.0;
-        else
-          dy = 0.0;
-      }
+      if (isLockAxis)
+        lockAxis(m_lockedAxis, dx, dy);
+      else
+        m_lockedAxis = LockedAxis::NONE;
 
       bounds.offset(dx, dy);
 

src/app/ui/editor/pixels_movement.h

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019-2024  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -15,6 +15,7 @@
 #include "app/transformation.h"
 #include "app/tx.h"
 #include "app/ui/editor/handle_type.h"
+#include "app/util/moving_utils.h"
 #include "doc/algorithm/flip_type.h"
 #include "doc/frame.h"
 #include "doc/image_ref.h"
@@ -190,6 +191,7 @@ private:
   Transformation m_currentData;
   std::unique_ptr<Mask> m_initialMask, m_initialMask0;
   std::unique_ptr<Mask> m_currentMask;
+  LockedAxis m_lockedAxis;
   bool m_opaque;
   color_t m_maskColor;
   obs::scoped_connection m_pivotVisConn;

src/app/util/moving_utils.cpp

@@ -0,0 +1,49 @@
+// Aseprite
+// Copyright (C) 2025  Igara Studio S.A.
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#include "app/util/moving_utils.h"
+
+#include <cmath>
+
+namespace app {
+
+void lockAxis(LockedAxis& lockedAxis, gfx::PointF& delta)
+{
+  double dx = delta.x;
+  double dy = delta.y;
+  lockAxis(lockedAxis, dx, dy);
+  delta.x = dx;
+  delta.y = dy;
+}
+
+void lockAxis(LockedAxis& lockedAxis, double& dx, double& dy)
+{
+  if (lockedAxis == LockedAxis::NONE) {
+    if (std::abs(dx) * 3 > std::abs(dy) * 7) {
+      lockedAxis = LockedAxis::Y;
+      dy = 0.0;
+    }
+    else if (std::abs(dy) * 3 > std::abs(dx) * 7) {
+      lockedAxis = LockedAxis::X;
+      dx = 0.0;
+    }
+    else {
+      const bool sameSign = std::signbit(dx) == std::signbit(dy);
+      lockedAxis = sameSign ? LockedAxis::R_DIAG : LockedAxis::L_DIAG;
+      dy = sameSign ? dx : -dx;
+    }
+  }
+  else {
+    switch (lockedAxis) {
+      case LockedAxis::X:      dx = 0.0; break;
+      case LockedAxis::Y:      dy = 0.0; break;
+      case LockedAxis::R_DIAG: dy = dx; break;
+      case LockedAxis::L_DIAG: dy = -dx; break;
+    }
+  }
+}
+
+} // namespace app

src/app/util/moving_utils.h

@@ -0,0 +1,29 @@
+// Aseprite
+// Copyright (C) 2025 Igara Studio S.A.
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#ifndef APP_UTIL_MOVING_UTILS_H_INCLUDED
+#define APP_UTIL_MOVING_UTILS_H_INCLUDED
+#pragma once
+
+#include "gfx/point.h"
+
+namespace app {
+
+enum LockedAxis {
+  NONE,
+  X,
+  Y,
+  R_DIAG,
+  L_DIAG,
+};
+
+void lockAxis(LockedAxis& lockedAxis, gfx::PointF& delta);
+
+void lockAxis(LockedAxis& lockedAxis, double& dx, double& dy);
+
+} // namespace app
+
+#endif // APP_UTIL_MOVING_UTILS_H_INCLUDED

src/main/osx/Entitlements.plist

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>com.apple.security.cs.allow-dyld-environment-variables</key>
+    <true/>
+    <key>com.apple.security.cs.disable-library-validation</key>
+    <true/>
+</dict>
+</plist>

src/main/osx/Info.plist

@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>CFBundleDocumentTypes</key>
+    <array>
+        <dict>
+            <key>CFBundleTypeExtensions</key>
+            <array>
+                <string>aseprite</string>
+            </array>
+            <key>CFBundleTypeIconFile</key>
+            <string>Document.icns</string>
+            <key>CFBundleTypeName</key>
+            <string>Aseprite Sprite</string>
+            <key>CFBundleTypeRole</key>
+            <string>Editor</string>
+            <key>LSHandlerRank</key>
+            <string>Owner</string>
+        </dict>
+        <dict>
+            <key>CFBundleTypeExtensions</key>
+            <array>
+                <string>ase</string>
+                <string>bmp</string>
+                <string>flc</string>
+                <string>fli</string>
+                <string>gif</string>
+                <string>ico</string>
+                <string>jpeg</string>
+                <string>jpg</string>
+                <string>pcx</string>
+                <string>png</string>
+                <string>tga</string>
+            </array>
+            <key>CFBundleTypeIconFile</key>
+            <string>Document.icns</string>
+            <key>CFBundleTypeName</key>
+            <string>Aseprite Sprite</string>
+            <key>CFBundleTypeRole</key>
+            <string>Editor</string>
+        </dict>
+        <dict>
+            <key>CFBundleTypeExtensions</key>
+            <array>
+                <string>aseprite-extension</string>
+            </array>
+            <key>CFBundleTypeIconFile</key>
+            <string>Extension.icns</string>
+            <key>CFBundleTypeName</key>
+            <string>Aseprite Extension</string>
+            <key>CFBundleTypeRole</key>
+            <string>Editor</string>
+            <key>LSHandlerRank</key>
+            <string>Owner</string>
+        </dict>
+    </array>
+    <key>CFBundleDisplayName</key>
+    <string>Aseprite</string>
+    <key>CFBundleExecutable</key>
+    <string>aseprite</string>
+    <key>CFBundleIdentifier</key>
+    <string>org.aseprite.Aseprite</string>
+    <key>CFBundleName</key>
+    <string>Aseprite</string>
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+    <key>CFBundleShortVersionString</key>
+    <string>1.3</string>
+    <key>CFBundleVersion</key>
+    <string>1.3</string>
+    <key>CFBundleIconFile</key>
+    <string>Aseprite.icns</string>
+    <key>LSApplicationCategoryType</key>
+    <string>public.app-category.graphics-design</string>
+    <key>NSHumanReadableCopyright</key>
+    <string>Copyright © 2001-2025, Igara Studio S.A.
+All rights reserved.</string>
+    <key>NSHighResolutionCapable</key>
+    <true/>
+    <key>NSRequiresAquaSystemAppearance</key>
+    <false/>
+</dict>
+</plist>