Merge branch 'aseprite:main' into main

.clang-format

@@ -41,14 +41,14 @@ BraceWrapping:
   BeforeLambdaBody: false
   BeforeWhile:     false
   IndentBraces:    false
-  SplitEmptyFunction: false
+  SplitEmptyFunction: true
   SplitEmptyRecord: false
   SplitEmptyNamespace: false
 BreakBeforeBinaryOperators: None
 BreakBeforeConceptDeclarations: true
 BreakBeforeBraces: Custom
 BreakBeforeInheritanceComma: false
-BreakInheritanceList: BeforeComma
+BreakInheritanceList: AfterComma
 BreakBeforeTernaryOperators: false
 BreakConstructorInitializersBeforeComma: false
 BreakConstructorInitializers: BeforeComma

.github/workflows/build.yml

@@ -14,15 +14,15 @@ jobs:
             build_type: Release
             enable_ui: on
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: 'recursive'
     - name: ccache
       uses: hendrikmuhs/ccache-action@v1
       if: runner.os == 'Linux'
       with:
         key: ${{ matrix.os }}-${{ matrix.enable_ui }}
-    - uses: seanmiddleditch/gha-setup-ninja@master
+    - uses: turtlesec-no/get-ninja@main
     - uses: ilammy/msvc-dev-cmd@v1
       if: runner.os == 'Windows'
     - name: 安装依赖

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "tests/third_party/json"]
-	path = tests/third_party/json
-	url = https://github.com/aseprite/json.lua
 [submodule "third_party/pixman"]
 	path = third_party/pixman
 	url = https://github.com/aseprite/pixman.git

CMakeLists.txt

@@ -109,16 +109,6 @@ if(NOT LAF_OS_BACKEND)
   endif()
 endif()
 
-# Check valid gtk + libpng combination
-if(LAF_OS_WITH_GTK)
-  if(NOT USE_SHARED_LIBPNG)
-    message(FATAL_ERROR "Cannot compile with gtk and static libpng, set USE_SHARED_LIBPNG=ON")
-  endif()
-  if(NOT USE_SHARED_HARFBUZZ)
-    message(FATAL_ERROR "Cannot compile with gtk and static HarfBuzz, set USE_SHARED_HARFBUZZ=ON")
-  endif()
-endif()
-
 if(ENABLE_DRM AND NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/drm/CMakeLists.txt)
   message(FATAL_ERROR "Your Aseprite repository is incomplete, clone the drm repository")
 endif()

data/fonts/LICENSE.txt

@@ -1,5 +1,5 @@
 Aseprite Font
-Copyright (C) 2001-2017 David Capello
+Copyright (C) 2001-2023 David Capello
 http://www.aseprite.org/
 
 This work is licensed under the Creative Commons Attribution 4.0

data/gui.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Aseprite -->
-<!-- Copyright (C) 2018-2022  Igara Studio S.A. -->
+<!-- Copyright (C) 2018-2023  Igara Studio S.A. -->
 <!-- Copyright (C) 2001-2018  David Capello -->
 <gui>
   <!-- Keyboard shortcuts -->
@@ -76,6 +76,7 @@
       <key command="CanvasSize" shortcut="C" />
       <!-- Layer -->
       <key command="LayerProperties" shortcut="Shift+P" />
+      <key command="LayerProperties" shortcut="F2" context="Normal" />
       <key command="LayerVisibility" shortcut="Shift+X" />
       <key command="OpenGroup" shortcut="Shift+E" />
       <key command="NewLayer" shortcut="Shift+N" />
@@ -147,7 +148,7 @@
       <key command="ShowGrid" shortcut="Ctrl+'" mac="Cmd+'" />
       <key command="ShowPixelGrid" shortcut="Ctrl+Shift+'" mac="Cmd+Shift+'" />
       <key command="SnapToGrid" shortcut="Shift+S" />
-      <key command="SetLoopSection" shortcut="F2" />
+      <key command="SetLoopSection" shortcut="F2" context="FramesSelection" />
       <key command="ShowOnionSkin" shortcut="F3" />
       <key command="ToggleTimelineThumbnails" shortcut="F6" />
       <key command="Timeline" shortcut="Tab">
@@ -223,6 +224,18 @@
       <key command="ChangeBrush" shortcut="Minus Pad">
         <param name="change" value="decrement-size" />
       </key>
+      <key command="ChangeBrush" shortcut="Space+H">
+        <param name="change" value="flip-x" />
+      </key>
+      <key command="ChangeBrush" shortcut="Space+V">
+        <param name="change" value="flip-y" />
+      </key>
+      <key command="ChangeBrush" shortcut="Space+D">
+        <param name="change" value="flip-d" />
+      </key>
+      <key command="ChangeBrush" shortcut="Space+R">
+        <param name="change" value="rotate-90cw" />
+      </key>
 
       <!-- Custom brushes -->
       <key command="ChangeBrush" shortcut="Alt+1">
@@ -302,6 +315,12 @@
       <key command="LayerOpacity"><param name="opacity" value="224" /></key>
       <key command="LayerOpacity" shortcut="Shift+4"><param name="opacity" value="255" /></key>
 
+      <key command="ToggleOtherLayersOpacity" />
+      <key command="ToggleOtherLayersOpacity" shortcut="Shift+F7">
+        <param name="preview" value="true" />
+        <param name="checkedIfZero" value="true" />
+      </key>
+
       <!-- Scroll to center -->
       <key command="ScrollCenter" shortcut="Shift+Z" />
       <key command="FitScreen" shortcut="Ctrl+0" mac="Cmd+0" />
@@ -911,6 +930,23 @@
         </item>
         <item command="RemoveFrame" text="@.frame_delete_frame" group="cel_delete" />
         <separator />
+        <menu text="@.frame_playback" id="animation_menu" group="cel_animation">
+          <item command="PlayAnimation" />
+          <item command="PlayPreviewAnimation" />
+          <separator />
+          <item command="SetPlaybackSpeed"><param name="multiplier" value="0.25" /></item>
+          <item command="SetPlaybackSpeed"><param name="multiplier" value="0.5" /></item>
+          <item command="SetPlaybackSpeed"><param name="multiplier" value="1.0" /></item>
+          <item command="SetPlaybackSpeed"><param name="multiplier" value="1.5" /></item>
+          <item command="SetPlaybackSpeed"><param name="multiplier" value="2.0" /></item>
+          <item command="SetPlaybackSpeed"><param name="multiplier" value="3.0" /></item>
+          <separator />
+          <item command="TogglePlayOnce" />
+          <item command="TogglePlayAll" />
+          <item command="TogglePlaySubtags" />
+          <separator />
+          <item command="ToggleRewindOnStop" />
+        </menu>
         <menu text="@.frame_tags">
           <item command="FrameTagProperties" text="@.frame_tags_tag_properties" />
           <separator />
@@ -928,7 +964,6 @@
           <separator />
           <item command="GotoFrame" text="@.frame_go_to_frame" />
         </menu>
-        <item command="PlayAnimation" text="@.frame_play_animation" group="cel_animation" />
         <separator />
         <item command="FrameProperties" text="@.frame_constant_frame_rate">
           <param name="frame" value="all" />
@@ -1000,7 +1035,14 @@
         <item command="Timeline" text="@.view_timeline">
           <param name="switch" value="true" />
         </item>
-        <item command="TogglePreview" text="@.view_preview" />
+        <menu text="@.view_preview">
+          <item command="TogglePreview" text="@.view_preview" />
+          <separator />
+          <item command="ToggleOtherLayersOpacity" text="@.view_preview_hide_other_layers">
+            <param name="preview" value="true" />
+            <param name="checkedIfZero" value="true" />
+          </item>
+        </menu>
         <item command="AdvancedMode" text="@.view_advanced_mode" />
         <item command="FullscreenMode" text="@.view_full_screen_mode" />
         <item command="FullscreenPreview" text="@.view_full_screen_preview" />
@@ -1220,7 +1262,7 @@
         <param name="type" value="shading" />
       </item>
       <separator />
-      <item command="SetSameInk" text="@.same_in_all_tools" group="ink_options" />
+      <item command="SetSameInk" text="@general.same_in_all_tools" group="ink_options" />
     </menu>
 
   </menus>

data/pref.xml

@@ -180,7 +180,7 @@
       <option id="straight_line_preview" type="bool" default="true" />
       <option id="play_once" type="bool" default="false" />
       <option id="play_all" type="bool" default="false" />
-      <option id="play_subtags" type="bool" default="false" />
+      <option id="play_subtags" type="bool" default="true" />
       <!-- TODO this would be nice to be "true" but we have to fix
            some performance issue rendering huge sprites with small
            zoom levels -->
@@ -212,7 +212,7 @@
     <section id="preview" text="Preview">
       <option id="play_once" type="bool" default="false" />
       <option id="play_all" type="bool" default="false" />
-      <option id="play_subtags" type="bool" default="false" />
+      <option id="play_subtags" type="bool" default="true" />
     </section>
     <section id="theme" text="Theme">
       <option id="selected" type="std::string" default="&quot;default&quot;" />
@@ -234,6 +234,7 @@
       <option id="load_wintab_driver" type="bool" default="false" />
       <option id="flash_layer" type="bool" default="false" />
       <option id="nonactive_layers_opacity" type="int" default="255" />
+      <option id="nonactive_layers_opacity_preview" type="int" default="255" />
     </section>
     <section id="news">
       <option id="cache_file" type="std::string" />
@@ -255,6 +256,7 @@
       <option id="show_invalid_fg_bg_color_alert" type="bool" default="true" />
       <option id="entries_separator" type="bool" default="true" />
       <option id="show_color_and_tiles" type="bool" default="true" />
+      <option id="default_tileset_mode" type="app::TilesetMode" default="app::TilesetMode::Auto" />
     </section>
     <section id="updater">
       <option id="inits" type="int" default="0" />
@@ -315,6 +317,7 @@
       <option id="discard_brush" type="bool" default="false" />
     </section>
     <section id="shared">
+      <option id="share_dynamics" type="bool" default="false" />
       <option id="share_ink" type="bool" default="false" />
       <option id="ink" type="app::tools::InkType" default="app::tools::InkType::DEFAULT" />
     </section>
@@ -429,6 +432,9 @@
       <option id="base_index" type="int" default="1" />
       <option id="cache_compressed_tilesets" type="bool" default="true" />
     </section>
+    <section id="tilemap">
+      <option id="show_delete_unused_tileset_alert" type="bool" default="true" />
+    </section>
   </global>
 
   <tool>
@@ -454,6 +460,21 @@
       <option id="refer_to" type="FillReferTo" default="FillReferTo::ACTIVE_LAYER" />
       <option id="pixel_connectivity" type="PixelConnectivity" default="PixelConnectivity::FOUR_CONNECTED" />
     </section>
+    <section id="dynamics">
+      <option id="stabilizer" type="bool" default="false" />
+      <option id="stabilizer_factor" type="int" default="0" />
+      <option id="size" type="app::tools::DynamicSensor" default="app::tools::DynamicSensor::Static" />
+      <option id="angle" type="app::tools::DynamicSensor" default="app::tools::DynamicSensor::Static" />
+      <option id="gradient" type="app::tools::DynamicSensor" default="app::tools::DynamicSensor::Static" />
+      <option id="min_size" type="int" default="1" />
+      <option id="min_angle" type="int" default="1" />
+      <option id="color_from_to" type="app::tools::ColorFromTo" default="app::tools::ColorFromTo::BgToFg" />
+      <option id="matrix_index" type="int" default="0" />
+      <option id="min_pressure_threshold" type="double" default="0.1" />
+      <option id="max_pressure_threshold" type="double" default="0.9" />
+      <option id="min_velocity_threshold" type="double" default="0.1" />
+      <option id="max_velocity_threshold" type="double" default="0.9" />
+    </section>
   </tool>
 
   <document>