Merge ea01d1963c into cef92c1a38

Add .plist files for macOS
We don't have an Aseprite.app target in cmake files yet, but we might add it in a near future.
2025-07-29 23:47:48 -05:00 · 2025-07-28 16:18:19 -03:00 · 2024-12-03 10:38:47 -03:00
6 changed files with 99 additions and 2 deletions
--- a/src/CMakeLists.txt
+++ b/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}
--- a/src/main/osx/Entitlements.plist
+++ b/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>
--- a/src/main/osx/Info.plist
+++ b/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>
--- a/src/main/win/resources_win32.rc
+++ b/src/main/win/resources_win32.rc
--- a/src/main/win/settings.manifest
+++ b/src/main/win/settings.manifest
--- a/src/ui/manager.cpp
+++ b/src/ui/manager.cpp
@ -1457,6 +1457,7 @@ void Manager::_openWindow(Window* window, bool center)
      spec.minimizable(window->isDesktop());
      spec.borderless(!window->isDesktop());
      spec.transparent(window->isTransparent());
+      spec.modal(window->isForeground() || window->isOnTop());

      if (!window->isDesktop()) {
        spec.parent(parentDisplay->nativeWindow());
Author	SHA1	Message	Date
Gaspar Capello	efe744c36d	Merge `ea01d1963c` into `cef92c1a38`	2025-07-29 23:47:48 -05:00
David Capello	cef92c1a38	Add .plist files for macOS build-auto / build-auto (Debug, macos-latest) (push) Has been cancelled Details build-auto / build-auto (Debug, ubuntu-latest) (push) Has been cancelled Details build-auto / build-auto (Debug, windows-latest) (push) Has been cancelled Details build-auto / build-auto (RelWithDebInfo, macos-latest) (push) Has been cancelled Details build-auto / build-auto (RelWithDebInfo, ubuntu-latest) (push) Has been cancelled Details build-auto / build-auto (RelWithDebInfo, windows-latest) (push) Has been cancelled Details build / build (Debug, macos-latest, lua, cli) (push) Has been cancelled Details build / build (Debug, macos-latest, noscripts, cli) (push) Has been cancelled Details build / build (Debug, ubuntu-latest, lua, cli) (push) Has been cancelled Details build / build (Debug, ubuntu-latest, noscripts, cli) (push) Has been cancelled Details build / build (Debug, windows-latest, lua, cli) (push) Has been cancelled Details build / build (Debug, windows-latest, noscripts, cli) (push) Has been cancelled Details build / build (RelWithDebInfo, macos-latest, lua, gui) (push) Has been cancelled Details build / build (RelWithDebInfo, ubuntu-latest, lua, gui) (push) Has been cancelled Details build / build (RelWithDebInfo, windows-latest, lua, gui) (push) Has been cancelled Details We don't have an Aseprite.app target in cmake files yet, but we might add it in a near future.	2025-07-28 16:18:19 -03:00
Gaspar Capello	ea01d1963c	Fix inactive window passes events to window below (fix #4561 ) Prior to this fix, if all of the following conditions were met: + While a modal window (such as the Preferences dialog) was open. + 'Multiple window UI' was enabled. + A non-modal window (such as the Preview window) overlapped the modal window. + The non-modal window was selected, so this window is on top of the modal window. Caused mouse clicks and movements within the overlay area of the non-modal window to be incorrectly passed to the window below, i.e. the modal window. Instead, it would be expected that no action would be taken.	2024-12-03 10:38:47 -03:00