Merge 45a92d6f68 into 5d5f3ec234

* Added AppShortcut::fitsBetterThan() to compare shortcuts and decide
  which one is better depending on the current key context and the ones
  where shortcuts are defined
* Added Key::fitsContext() to known if this key definition makes sense
  for a given current key context, e.g. Normal context can be used in
  SelectionTool context, and SelectionTool can be used in Transformation
* Added KeyboardShortcuts::findBestKeyFromMessage() to centralize the
  keyboard shortcuts matching moving some code from
  CustomizedGuiManager::processKey()
* Added more keyboard shortcuts tests (including some for #5390)

.github/ISSUE_TEMPLATE.md

@@ -1,9 +0,0 @@
-Describe your bug report or feature request here
-...
-...
-...
-
-### Aseprite and System version
-
-* Aseprite version: version number, installer/portable/Steam/beta/dev/commit-hash
-* System: Windows/macOS/Linux, version, distribution

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,32 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug, triage
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots or a screen recording to help explain your problem.
+
+**Aseprite & System (please complete the following information):**
+- Aseprite: [version number, installer/portable/Steam/beta/dev/commit-hash]
+- System: [Windows/macOS/Linux, version, distribution]
+- Extensions: [List the extensions you have installed]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,29 @@
+---
+name: Feature request
+about: Suggest an idea for Aseprite
+title: ''
+labels: feature, triage
+assignees: ''
+
+---
+
+**Did other user suggested a similar idea?**
+- [ ] No
+- [ ] Yes/Links to similar ideas
+  > You can try to find a similar feature requests before in:
+  > - GitHub issues: https://github.com/aseprite/aseprite/issues?q=label%3Afeature
+  > - Community site: https://community.aseprite.org/c/features/7
+  > - Steam community: https://steamcommunity.com/app/431730/discussions/1/
+  > In case you find a similar feature request, making a comment there will be useful to give some traction and show interest in the feature.
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

AUTHORS.md

@@ -4,7 +4,7 @@ Aseprite is being developed and maintained currently by [Igara Studio](https://i
 The active team of developers is:
 
 * [David Capello](https://github.com/dacap)
-* [Gaspar Capello](https://github.com/Gsparoken)
+* [Gaspar Capello](https://github.com/Gasparoken)
 * [Martín Capello](https://github.com/martincapello)
 * [Christian Kaiser](https://github.com/ckaiser)
 * [Dante Paola](https://github.com/Liebranca)

INSTALL.md

@@ -222,6 +222,7 @@ steps as above but when we call `cmake`, we have some differences:
       -DSKIA_DIR=$HOME/deps/skia \
       -DSKIA_LIBRARY_DIR=$HOME/deps/skia/out/Release-arm64 \
       -DSKIA_LIBRARY=$HOME/deps/skia/out/Release-arm64/libskia.a \
+      -DWEBP_LIBRARIES=$HOME/deps/skia/out/Release-arm64/libwebp.a \
       -DPNG_ARM_NEON:STRING=on \
       -G Ninja \
       ..
@@ -252,6 +253,7 @@ you must use libstdc++ to compile Aseprite:
       -DSKIA_DIR=$HOME/deps/skia \
       -DSKIA_LIBRARY_DIR=$HOME/deps/skia/out/Release-x64 \
       -DSKIA_LIBRARY=$HOME/deps/skia/out/Release-x64/libskia.a \
+      -DWEBP_LIBRARIES=$HOME/deps/skia/out/Release-x64/libwebp.a \
       -G Ninja \
       ..
     ninja aseprite

build.sh

@@ -428,9 +428,17 @@ if [ ! -d "$skia_library_dir" ] ; then
         skia_url=$(bash laf/misc/skia-url.sh $skia_build)
         skia_file=$(basename $skia_url)
         if [ ! -f "$skia_dir/$skia_file" ] ; then
+            if ! command -v curl >/dev/null 2>&1 ; then
+                echo "Error: 'curl' command line tool is not available in PATH"
+                exit 1
+            fi
             curl --ssl-revoke-best-effort -L -o "$skia_dir/$skia_file" "$skia_url"
         fi
         if [ ! -d "$skia_library_dir" ] ; then
+            if ! command -v unzip >/dev/null 2>&1 ; then
+                echo "Error: 'unzip' command line tool is not available in PATH"
+                exit 1
+            fi
             unzip -n -d "$skia_dir" "$skia_dir/$skia_file"
         fi
     else

cmake/FindHarfBuzz.cmake

@@ -30,7 +30,7 @@
 # HARFBUZZ_INCLUDE_DIRS - containg the HarfBuzz headers
 # HARFBUZZ_LIBRARIES - containg the HarfBuzz library
 
-include(FindPkgConfig)
+find_package(PkgConfig QUIET)
 
 pkg_check_modules(PC_HARFBUZZ harfbuzz>=0.9.7)
 

data/gui.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Aseprite -->
-<!-- Copyright (C) 2018-2024  Igara Studio S.A. -->
+<!-- Copyright (C) 2018-2025  Igara Studio S.A. -->
 <!-- Copyright (C) 2001-2018  David Capello -->
 <gui>
   <!-- Keyboard shortcuts -->
@@ -371,6 +371,12 @@
         <param name="quantity" value="1" />
       </key>
 
+      <!-- Main selection actions (apply transformation / undo) -->
+      <key command="DeselectMask" shortcut="Esc" context="Transformation" />
+      <key command="Apply" shortcut="Enter" context="Transformation" />
+      <key command="Apply" shortcut="Enter Pad" context="Transformation" />
+      <key command="Undo" shortcut="Ctrl+Z" mac="Cmd+Z" context="Transformation" />
+
       <!-- Move selection with arrows -->
       <key command="MoveMask" shortcut="Left" context="Selection">
         <param name="target" value="content" />
@@ -1203,6 +1209,7 @@
 
     <menu id="slice_popup_menu">
       <item command="SliceProperties" text="@.properties" group="slice_popup_properties" />
+      <item command="DuplicateSlice" text="@.duplicate" group="slice_popup_duplicate" />
       <item command="RemoveSlice" text="@.delete" group="slice_popup_delete" />
     </menu>
 

data/pref.xml

@@ -356,6 +356,7 @@
     <section id="file_selector">
       <option id="current_folder" type="std::string" default="&quot;&lt;empty&gt;&quot;" />
       <option id="zoom" type="double" default="1.0" />
+      <option id="show_hidden" type="bool" default="false" />
     </section>
     <section id="text_tool">
       <option id="font_face" type="std::string" />

data/strings/en.ini

@@ -206,6 +206,7 @@ AddColor_Background = Background
 AddColor_Foreground = Foreground
 AddColor_Specific = Specific
 AdvancedMode = Advanced Mode
+Apply = Apply
 AutocropSprite = Trim Sprite
 AutocropSprite_ByGrid = Trim Sprite by Grid
 BackgroundFromLayer = Background from Layer
@@ -265,6 +266,7 @@ Despeckle = Despeckle
 DeveloperConsole = Developer Console
 DiscardBrush = Discard Brush
 DuplicateLayer = Duplicate Layer
+DuplicateSlice = Duplicate Slice
 DuplicateSprite = Duplicate Sprite
 DuplicateView = Duplicate View
 Exit = Exit
@@ -581,8 +583,9 @@ rotsprite = RotSprite
 pixel_perfect = Pixel-perfect
 linear_gradient = Linear Gradient
 radial_gradient = Radial Gradient
-drop_pixel = Drop pixels here (Enter)
-cancel_drag = Cancel drag and drop (Esc)
+drop_pixel_and_deselect = Apply transformation and deselect
+drop_pixel = Apply transformation and keep selection
+cancel_drag = Cancel transformation and undo/discard changes
 auto_select_layer = Auto Select Layer
 all = All
 none = None
@@ -621,6 +624,14 @@ current_layer = Current Layer
 first_ref_layer = First Reference Layer
 pick = Pick:
 sample = Sample:
+position_label = P:
+rotation_label = R:
+position_x = X Position
+position_y = Y Position
+size_width = Width
+size_height = Height
+rotation_angle = Angle
+rotation_skew = Skew
 
 [convolution_matrix]
 reload_stock = &Reload Stock
@@ -765,6 +776,7 @@ pinned_folders = Pinned Folders
 recent_folders = Recent Folders
 all_formats = All formats
 all_files = All files
+show_hidden = Show hidden
 
 [filters]
 selected_cels = Selected
@@ -788,7 +800,22 @@ empty_fonts = No system fonts were found
 [font_style]
 antialias = Antialias
 hinting = Hinting
+hinting_none = No Hinting
+hinting_slight = Slight Hinting
+hinting_full = Full Hinting
 ligatures = Ligatures
+font_weight = Font Weight
+italic = Italic
+font_weight_100 = Thin
+font_weight_200 = Extra Light
+font_weight_300 = Light
+font_weight_400 = Normal
+font_weight_500 = Medium
+font_weight_600 = Semi Bold
+font_weight_700 = Bold
+font_weight_800 = Extra Bold
+font_weight_900 = Black
+font_weight_1000 = Extra Black
 
 [frame_combo]
 all_frames = All frames
@@ -816,6 +843,7 @@ same_in_all_tools = Same in all Tools
 opacity = Opacity:
 tolerance = Tolerance:
 show_more = Show more...
+copy_of = {} Copy
 
 [general_text]
 copy = &Copy
@@ -956,6 +984,7 @@ key_context_move_tool = Move Tool
 key_context_freehand_tool = Freehand Tool
 key_context_shape_tool = Shape Tool
 key_context_frames_selection = Frames Selection
+key_context_transformation = Transformation
 copy_selection = Copy Selection
 snap_to_grid = Snap To Grid
 lock_axis = Lock Axis
@@ -1663,6 +1692,10 @@ from = From:
 to = To:
 tolerance = Tolerance:
 
+[duplicate_slice]
+x_duplicated = Slice "{}" duplicated
+n_slices_duplicated = {} slice(s) duplicated
+
 [remove_slice]
 x_removed = Slice "{}" removed
 n_slices_removed = {} slice(s) removed
@@ -1747,6 +1780,7 @@ delete_file = Delete file, I've already sent it
 
 [slice_popup_menu]
 properties = Slice &Properties...
+duplicate = D&uplicate Slice
 delete = &Delete Slice
 
 [slice_properties]
@@ -1834,6 +1868,18 @@ pixel_scale = Pixel Scale
 with_vars = Use CSS3 Variables
 generate_html = Generate Sample HTML File
 
+[shape]
+fill = Fill
+stroke = Stroke
+stroke_width = Stroke Width
+
+[text_tool]
+font_family = Font Family
+font_size = Font Size
+bold = Bold
+italic = Italic
+more_options = More Options
+
 [timeline_conf]
 position = Position:
 left = &Left
@@ -1896,6 +1942,7 @@ timeline_show = Show Timeline
 
 [undo_history]
 title = Undo History
+initial_state = Initial State
 
 [user_data]
 user_data = User Data:

data/widgets/file_selector.xml

@@ -23,6 +23,7 @@
       <combobox id="location" expansive="true" />
       <button text="" id="refresh_button" style="refresh_button"
                 tooltip="@.refresh_button_tooltip" tooltip_dir="bottom" />
+      <check id="show_hidden_check" text="@.show_hidden" />
     </box>
     <vbox id="file_view_placeholder" expansive="true" />
     <grid columns="2">

data/widgets/slice_properties.xml

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Aseprite -->
-<!-- Copyright (C) 2019-2024  Igara Studio S.A. -->
+<!-- Copyright (C) 2019-2025  Igara Studio S.A. -->
 <!-- Copyright (C) 2017-2018  David Capello -->
 <gui>
 <window id="slice_properties" text="@.title" help="slices#slice-properties">
-  <vbox>
+  <vbox expansive="true">
     <grid id="properties_grid" columns="3">
       <label id="label1" text="@.name" />
       <entry id="name" maxsize="256" magnet="true" cell_align="horizontal" expansive="true" />
       <button id="user_data" icon="icon_user_data" maxsize="32" tooltip="@.user_data_tooltip" />
     </grid>
-    <grid columns="2">
-      <separator horizontal="true" cell_hspan="2" />
+    <grid columns="3" expansive="true">
+      <separator horizontal="true" cell_hspan="3" />
 
       <box />
       <hbox homogeneous="true">
@@ -20,6 +20,7 @@
         <label text="@.width" />
         <label text="@.height" />
       </hbox>
+      <boxfiller cell_align="horizontal" />
 
       <label text="@.bounds" />
       <hbox homogeneous="true">
@@ -28,6 +29,7 @@
         <expr id="bounds_w" />
         <expr id="bounds_h" />
       </hbox>
+      <boxfiller />
 
       <check text="@.center" id="center" />
       <hbox homogeneous="true">
@@ -36,16 +38,18 @@
         <expr id="center_w" />
         <expr id="center_h" />
       </hbox>
+      <boxfiller />
 
       <check text="@.pivot" id="pivot" />
       <hbox>
         <expr id="pivot_x" />
         <expr id="pivot_y" />
       </hbox>
+      <boxfiller />
 
-      <separator horizontal="true" cell_hspan="2" />
-
-      <hbox cell_hspan="2">
+      <boxfiller cell_align="vertical" cell_hspan="3" />
+      <separator horizontal="true" cell_hspan="3" cell_align="horizontal" />
+      <hbox cell_hspan="3">
         <boxfiller />
         <hbox homogeneous="true">
           <button text="@general.ok" closewindow="true" id="ok" magnet="true" minwidth="60" />

data/widgets/tag_properties.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Aseprite -->
-<!-- Copyright (C) 2019-2021  Igara Studio S.A. -->
+<!-- Copyright (C) 2019-2025  Igara Studio S.A. -->
 <!-- Copyright (C) 2015-2018  David Capello -->
 <gui>
 <window id="tag_properties" text="@.title">
@@ -23,13 +23,14 @@
       <check text="@.repeat" id="limit_repeat" />
       <vbox id="repeat_placeholder" cell_hspan="2" />
     </grid>
+    <boxfiller />
     <grid columns="2">
-      <separator horizontal="true" cell_hspan="2" minwidth="180" />
+      <separator horizontal="true" cell_align="horizontal" cell_hspan="2" minwidth="180" />
 
-      <box horizontal="true" homogeneous="true" cell_hspan="2" cell_align="right">
+      <hbox homogeneous="true" cell_hspan="2" cell_align="right">
         <button text="@general.ok" closewindow="true" id="ok" magnet="true" minwidth="60" />
         <button text="@general.cancel" closewindow="true" />
-      </box>
+      </hbox>
     </grid>
   </vbox>
 </window>

laf

@@ -1 +1 @@
-Subproject commit e04e7c52e3b82134f714b2472cf526af5f186b53
+Subproject commit ff3146071e86db059af6eef64fd24096554fa15e

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}
@@ -220,6 +220,7 @@ if(ENABLE_TESTS)
   find_tests(ui ui-lib)
   find_tests(app/cli app-lib)
   find_tests(app/file app-lib)
+  find_tests(app/ui app-lib)
   find_tests(app app-lib)
   find_tests(. app-lib)
 endif()

src/README.md

@@ -72,6 +72,10 @@ In Debug mode (`_DEBUG`):
 * [`TRACEARGS`](https://github.com/aseprite/laf/blob/f3222bdee2d21556e9da55343e73803c730ecd97/base/debug.h#L40):
   in debug mode, it prints in the terminal/console each given argument
 
+In release mode you can use a similar function:
+
+* `PRINTARGS` prints in the terminal/console each given argument
+
 # Detect Platform
 
 You can check the platform using some `laf` macros:

src/app/CMakeLists.txt

@@ -74,7 +74,7 @@ add_custom_command(
   COMMAND ${CMAKE_COMMAND} -E copy_if_different ${output_fn}.tmp ${output_fn}
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
   MAIN_DEPENDENCY ${strings_en_ini}
-  DEPENDS ${GEN_DEP})
+  DEPENDS ${GEN_DEP} commands/commands_list.h)
 list(APPEND generated_files ${output_fn})
 
 # Check translations
@@ -368,6 +368,7 @@ target_sources(app-lib PRIVATE
   color_picker.cpp
   color_spaces.cpp
   color_utils.cpp
+  commands/apply.cpp
   commands/cmd_about.cpp
   commands/cmd_add_color.cpp
   commands/cmd_advanced_mode.cpp
@@ -393,6 +394,7 @@ target_sources(app-lib PRIVATE
   commands/cmd_deselect_mask.cpp
   commands/cmd_discard_brush.cpp
   commands/cmd_duplicate_layer.cpp
+  commands/cmd_duplicate_slice.cpp
   commands/cmd_duplicate_sprite.cpp
   commands/cmd_duplicate_view.cpp
   commands/cmd_enter_license.cpp
@@ -651,6 +653,7 @@ target_sources(app-lib PRIVATE
   ui/icon_button.cpp
   ui/incompat_file_window.cpp
   ui/input_chain.cpp
+  ui/key.cpp
   ui/keyboard_shortcuts.cpp
   ui/layer_frame_comboboxes.cpp
   ui/main_menu_bar.cpp
@@ -715,6 +718,7 @@ target_sources(app-lib PRIVATE
   util/render_text.cpp
   util/resize_image.cpp
   util/shader_helpers.cpp
+  util/slice_utils.cpp
   util/tile_flags_utils.cpp
   util/tileset_utils.cpp
   util/wrap_point.cpp

src/app/commands/apply.cpp

@@ -0,0 +1,46 @@
+// Aseprite
+// Copyright (C) 2025  Igara Studio S.A.
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#ifdef HAVE_CONFIG_H
+  #include "config.h"
+#endif
+
+#include "app/commands/command.h"
+#include "app/context.h"
+#include "app/ui/editor/editor.h"
+
+namespace app {
+
+// Depends on the current context/state, used to apply the current
+// transformation (drop pixels).
+class ApplyCommand : public Command {
+public:
+  ApplyCommand();
+
+protected:
+  void onExecute(Context* ctx) override;
+};
+
+ApplyCommand::ApplyCommand() : Command(CommandId::Apply(), CmdUIOnlyFlag)
+{
+}
+
+void ApplyCommand::onExecute(Context* ctx)
+{
+  if (!ctx->isUIAvailable())
+    return;
+
+  auto* editor = Editor::activeEditor();
+  if (editor && editor->isMovingPixels())
+    editor->dropMovingPixels();
+}
+
+Command* CommandFactory::createApplyCommand()
+{
+  return new ApplyCommand;
+}
+
+} // namespace app

src/app/commands/cmd_cel_properties.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
@@ -101,12 +101,12 @@ public:
 
     if (countCels() > 0) {
       m_userDataView.configureAndSet((m_cel ? m_cel->data()->userData() : UserData()),
-                                     g_window->propertiesGrid());
+                                     propertiesGrid());
     }
     else if (!m_cel)
       m_userDataView.setVisible(false, false);
 
-    g_window->expandWindow(gfx::Size(g_window->bounds().w, g_window->sizeHint().h));
+    expandWindow(gfx::Size(bounds().w, sizeHint().h));
     updateFromCel();
   }
 
@@ -281,7 +281,7 @@ private:
   {
     if (countCels() > 0) {
       m_userDataView.toggleVisibility();
-      g_window->expandWindow(gfx::Size(g_window->bounds().w, g_window->sizeHint().h));
+      expandWindow(gfx::Size(bounds().w, sizeHint().h));
     }
   }
 

src/app/commands/cmd_duplicate_slice.cpp

@@ -0,0 +1,122 @@
+// Aseprite
+// Copyright (C) 2025  Igara Studio S.A.
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#ifdef HAVE_CONFIG_H
+  #include "config.h"
+#endif
+
+#include "app/cmd/add_slice.h"
+#include "app/commands/command.h"
+#include "app/context.h"
+#include "app/context_access.h"
+#include "app/context_flags.h"
+#include "app/i18n/strings.h"
+#include "app/site.h"
+#include "app/tx.h"
+#include "app/ui/status_bar.h"
+#include "app/util/slice_utils.h"
+#include "base/convert_to.h"
+#include "doc/object_id.h"
+#include "doc/slice.h"
+
+namespace app {
+
+// Moves the given slice by the dx and dy values
+void offset(Slice* slice, int dx, int dy)
+{
+  for (auto it = slice->begin(); it != slice->end(); ++it) {
+    auto* sk = (*it).value();
+    gfx::Rect bounds = sk->bounds();
+    bounds.offset(gfx::Point{ dx, dy });
+    sk->setBounds(bounds);
+  }
+}
+
+class DuplicateSliceCommand : public Command {
+public:
+  DuplicateSliceCommand();
+
+protected:
+  void onLoadParams(const Params& params) override;
+  bool onEnabled(Context* context) override;
+  void onExecute(Context* context) override;
+
+private:
+  ObjectId m_sliceId;
+};
+
+DuplicateSliceCommand::DuplicateSliceCommand()
+  : Command(CommandId::DuplicateSlice(), CmdRecordableFlag)
+{
+}
+
+void DuplicateSliceCommand::onLoadParams(const Params& params)
+{
+  std::string id = params.get("id");
+  if (!id.empty())
+    m_sliceId = ObjectId(base::convert_to<doc::ObjectId>(id));
+  else
+    m_sliceId = NullId;
+}
+
+bool DuplicateSliceCommand::onEnabled(Context* context)
+{
+  return context->checkFlags(ContextFlags::ActiveDocumentIsWritable |
+                             ContextFlags::HasActiveSprite | ContextFlags::HasActiveLayer);
+}
+
+void DuplicateSliceCommand::onExecute(Context* context)
+{
+  std::vector<Slice*> selectedSlices;
+  {
+    const ContextReader reader(context);
+    if (m_sliceId == NullId) {
+      selectedSlices = get_selected_slices(reader.site());
+      if (selectedSlices.empty())
+        return;
+    }
+    else
+      selectedSlices.push_back(reader.sprite()->slices().getById(m_sliceId));
+  }
+
+  ContextWriter writer(context);
+  Tx tx(writer, "Duplicate Slice");
+  Sprite* sprite = writer.site().sprite();
+
+  Doc* doc = static_cast<Doc*>(sprite->document());
+  doc->notifyBeforeSlicesDuplication();
+  for (auto* s : selectedSlices) {
+    Slice* slice = new Slice(*s);
+    slice->setName(Strings::general_copy_of(slice->name()));
+    // Offset a bit the duplicated slice to avoid overlapping
+    offset(slice, 2, 2);
+
+    tx(new cmd::AddSlice(sprite, slice));
+    doc->notifySliceDuplicated(slice);
+  }
+  tx.commit();
+
+  std::string sliceName;
+  if (selectedSlices.size() == 1)
+    sliceName = selectedSlices[0]->name();
+
+  StatusBar::instance()->invalidate();
+  if (!sliceName.empty()) {
+    StatusBar::instance()->showTip(1000, Strings::duplicate_slice_x_duplicated(sliceName));
+  }
+  else {
+    StatusBar::instance()->showTip(
+      1000,
+      Strings::duplicate_slice_n_slices_duplicated(selectedSlices.size()));
+  }
+}
+
+Command* CommandFactory::createDuplicateSliceCommand()
+{
+  return new DuplicateSliceCommand;
+}
+
+} // namespace app

src/app/commands/cmd_keyboard_shortcuts.cpp

@@ -225,7 +225,7 @@ private:
     LockButtons lock(this);
     // We need to create a copy of the shortcut because
     // Key::disableShortcut() will modify the shortcuts() collection itself.
-    ui::Shortcut shortcut = m_key->shortcuts()[index];
+    Shortcut shortcut = m_key->shortcuts()[index];
 
     if (ui::Alert::show(Strings::alerts_delete_shortcut(shortcut.toString())) != 1)
       return;
@@ -269,7 +269,7 @@ private:
 
     if (m_key && m_key->keycontext() != KeyContext::Any) {
       int w = m_headerItem->contextXPos() +
-              font()->textLength(convertKeyContextToUserFriendlyString(m_key->keycontext()));
+              font()->textLength(convert_keycontext_to_user_friendly_string(m_key->keycontext()));
       size.w = std::max(size.w, w);
     }
 
@@ -317,7 +317,7 @@ private:
 
     if (m_key && !m_key->shortcuts().empty()) {
       if (m_key->keycontext() != KeyContext::Any) {
-        g->drawText(convertKeyContextToUserFriendlyString(m_key->keycontext()),
+        g->drawText(convert_keycontext_to_user_friendly_string(m_key->keycontext()),
                     fg,
                     bg,
                     gfx::Point(contextXPos, y));
@@ -329,7 +329,7 @@ private:
         gfx::Rect(keyXPos, y, contextXPos - keyXPos, dh * m_key->shortcuts().size()));
       if (clip) {
         int i = 0;
-        for (const Shortcut& shortcut : m_key->shortcuts()) {
+        for (const AppShortcut& shortcut : m_key->shortcuts()) {
           if (i != m_hotShortcut || !m_changeButton) {
             g->drawText(getShortcutText(shortcut), fg, bg, gfx::Point(keyXPos, y));
           }
@@ -362,7 +362,7 @@ private:
         gfx::Rect bounds = this->bounds();
         MouseMessage* mouseMsg = static_cast<MouseMessage*>(msg);
 
-        const Shortcuts* shortcuts = (m_key ? &m_key->shortcuts() : NULL);
+        const AppShortcuts* shortcuts = (m_key ? &m_key->shortcuts() : nullptr);
         int y = bounds.y;
         int dh = textSize().h + 4 * guiscale();
         int maxi = (shortcuts && shortcuts->size() > 1 ? shortcuts->size() : 1);
@@ -457,7 +457,7 @@ private:
     m_hotShortcut = -1;
   }
 
-  std::string getShortcutText(const Shortcut& shortcut) const
+  std::string getShortcutText(const AppShortcut& shortcut) const
   {
     if (m_key && m_key->type() == KeyType::WheelAction && shortcut.isEmpty()) {
       return Strings::keyboard_shortcuts_default_action();
@@ -595,7 +595,7 @@ private:
         case KeyContext::MoveTool:
         case KeyContext::FreehandTool:
         case KeyContext::ShapeTool:
-          text = convertKeyContextToUserFriendlyString(key->keycontext()) + ": " + text;
+          text = convert_keycontext_to_user_friendly_string(key->keycontext()) + ": " + text;
           break;
       }
       KeyItem* keyItem = new KeyItem(m_keys, m_menuKeys, text, key, nullptr, 0, &m_headerItem);

src/app/commands/cmd_layer_properties.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2020-2024  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
@@ -166,7 +166,7 @@ public:
       m_document->add_observer(this);
 
     if (countLayers() > 0) {
-      m_userDataView.configureAndSet(m_layer->userData(), g_window->propertiesGrid());
+      m_userDataView.configureAndSet(m_layer->userData(), propertiesGrid());
       if (m_remapAfterConfigure) {
         remapWindow();
         centerWindow();
@@ -368,8 +368,7 @@ private:
   {
     if (m_layer) {
       m_userDataView.toggleVisibility();
-      g_window->remapWindow();
-      manager()->invalidate();
+      expandWindow(gfx::Size(bounds().w, sizeHint().h));
     }
   }
 

src/app/commands/cmd_new_layer.cpp

@@ -267,16 +267,8 @@ void NewLayerCommand::onExecute(Context* context)
     bool afterBackground = false;
 
     switch (m_type) {
-      case Type::Layer:
-
-        if (m_place == Place::BeforeActiveLayer) {
-          layer = api.newLayer(parent, name);
-          api.restackLayerBefore(layer, parent, activeLayer);
-        }
-        else
-          layer = api.newLayerAfter(parent, name, activeLayer);
-        break;
-      case Type::Group: layer = api.newGroupAfter(parent, name, activeLayer); break;
+      case Type::Layer: layer = api.newLayer(parent, name); break;
+      case Type::Group: layer = api.newGroup(parent, name); break;
       case Type::ReferenceLayer:
         layer = api.newLayer(parent, name);
         if (layer)
@@ -311,6 +303,15 @@ void NewLayerCommand::onExecute(Context* context)
 
     ASSERT(layer->parent());
 
+    // Reorder the resulting layer.
+    switch (m_place) {
+      case Place::AfterActiveLayer:  api.restackLayerAfter(layer, parent, activeLayer); break;
+      case Place::BeforeActiveLayer: api.restackLayerBefore(layer, parent, activeLayer); break;
+      case Place::Top:
+        api.restackLayerAfter(layer, sprite->root(), sprite->root()->lastLayer());
+        break;
+    }
+
     // Put new layer as an overlay of the background or in the first
     // layer in case the sprite is transparent.
     if (afterBackground) {

src/app/commands/cmd_paste_text.cpp

@@ -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
@@ -10,6 +10,7 @@
 #endif
 
 #include "app/app.h"
+#include "app/color_utils.h"
 #include "app/commands/command.h"
 #include "app/console.h"
 #include "app/context.h"
@@ -88,10 +89,10 @@ void PasteTextCommand::onExecute(Context* ctx)
     std::string text = window.userText()->text();
     app::Color color = window.fontColor()->getColor();
 
-    doc::ImageRef image = render_text(
-      fontInfo,
-      text,
-      gfx::rgba(color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha()));
+    ui::Paint paint = window.fontFace()->paint();
+    paint.color(color_utils::color_for_ui(color));
+
+    doc::ImageRef image = render_text(fontInfo, text, paint);
     if (image) {
       Sprite* sprite = editor->sprite();
       if (image->pixelFormat() != sprite->pixelFormat()) {

src/app/commands/cmd_sprite_properties.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -188,8 +188,7 @@ private:
   void onToggleUserData()
   {
     m_userDataView.toggleVisibility();
-    remapWindow();
-    manager()->invalidate();
+    expandWindow(gfx::Size(bounds().w, sizeHint().h));
   }
 
   void onTilesedDuplicated(const Tileset* tilesetClone)

src/app/commands/cmd_undo_history.cpp

@@ -21,6 +21,7 @@
 #include "app/doc_undo.h"
 #include "app/doc_undo_observer.h"
 #include "app/docs_observer.h"
+#include "app/i18n/strings.h"
 #include "app/modules/gui.h"
 #include "app/modules/palettes.h"
 #include "app/site.h"
@@ -292,7 +293,7 @@ public:
                    base::get_pretty_memory_size(static_cast<Cmd*>(state->cmd())->memSize())
 #endif
                  :
-                 std::string("Initial State"));
+                 Strings::undo_history_initial_state());
 
       if ((g->getClipBounds() & itemBounds).isEmpty())
         return;

src/app/commands/commands_list.h

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2023  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -8,6 +8,7 @@
 FOR_EACH_COMMAND(About)
 FOR_EACH_COMMAND(AddColor)
 FOR_EACH_COMMAND(AdvancedMode)
+FOR_EACH_COMMAND(Apply)
 FOR_EACH_COMMAND(AutocropSprite)
 FOR_EACH_COMMAND(BackgroundFromLayer)
 FOR_EACH_COMMAND(BrightnessContrast)
@@ -40,6 +41,7 @@ FOR_EACH_COMMAND(DeselectMask)
 FOR_EACH_COMMAND(Despeckle)
 FOR_EACH_COMMAND(DiscardBrush)
 FOR_EACH_COMMAND(DuplicateLayer)
+FOR_EACH_COMMAND(DuplicateSlice)
 FOR_EACH_COMMAND(DuplicateSprite)
 FOR_EACH_COMMAND(DuplicateView)
 FOR_EACH_COMMAND(Exit)

src/app/console.cpp

@@ -81,7 +81,7 @@ public:
 
   ~ConsoleWindow() { TRACE_CON("CON: ~ConsoleWindow this=", this); }
 
-  void addMessage(const std::string& msg)
+  void addMessage(std::string msg)
   {
     if (!m_hasText) {
       m_hasText = true;
@@ -93,6 +93,17 @@ public:
     gfx::Point pt = m_view.viewScroll();
     const bool autoScroll = (pt.y >= maxSize.h - visible.h);
 
+    // Escape characters we can't show properly
+    for (size_t i = 0; i < msg.size(); i++) {
+      switch (msg[i]) {
+        case '\a':
+        case '\b':
+        case '\r':
+        case '\t':
+        case '\v': msg[i] = ' ';
+      }
+    }
+
     m_textbox.setText(m_textbox.text() + msg);
 
     if (autoScroll) {

src/app/crash/data_recovery.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019-2023  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
@@ -139,6 +139,13 @@ DataRecovery::Sessions DataRecovery::sessions()
   return copy;
 }
 
+bool DataRecovery::isRunningSession(const SessionPtr& session) const
+{
+  ASSERT(session);
+  ASSERT(m_inProgress);
+  return session->path() == m_inProgress->path();
+}
+
 void DataRecovery::searchForSessions()
 {
   Sessions sessions;
@@ -150,7 +157,7 @@ void DataRecovery::searchForSessions()
     RECO_TRACE("RECO: Session '%s' ", itempath.c_str());
 
     SessionPtr session(new Session(&m_config, itempath));
-    if (!session->isRunning()) {
+    if (!isRunningSession(session)) {
       if ((session->isEmpty()) || (!session->isCrashedSession() && session->isOldSession())) {
         RECO_TRACE("to be deleted (%s)\n",
                    session->isEmpty() ? "is empty" :

src/app/crash/data_recovery.h

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019-2021  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
@@ -45,6 +45,8 @@ public:
   // Returns a copy of the list of sessions that can be recovered.
   Sessions sessions();
 
+  bool isRunningSession(const SessionPtr& session) const;
+
   // Triggered in the UI-thread from the m_thread using an
   // ui::execute_from_ui_thread() when the list of sessions is ready
   // to be used.

src/app/crash/session.cpp

@@ -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
@@ -19,12 +19,10 @@
 #include "app/crash/write_document.h"
 #include "app/doc.h"
 #include "app/doc_access.h"
-#include "app/file/file.h"
 #include "app/ui_context.h"
 #include "base/convert_to.h"
 #include "base/fs.h"
 #include "base/fstream_path.h"
-#include "base/process.h"
 #include "base/split_string.h"
 #include "base/string.h"
 #include "base/thread.h"
@@ -128,12 +126,6 @@ const Session::Backups& Session::backups()
   return m_backups;
 }
 
-bool Session::isRunning()
-{
-  loadPid();
-  return base::get_process_name(m_pid) == base::get_process_name(base::get_current_process_id());
-}
-
 bool Session::isCrashedSession()
 {
   loadPid();

src/app/crash/session.h

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019-2022  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
@@ -47,9 +47,9 @@ public:
 
   std::string name() const;
   std::string version();
+  std::string& path() { return m_path; }
   const Backups& backups();
 
-  bool isRunning();
   bool isCrashedSession();
   bool isOldSession();
   bool isEmpty();

src/app/doc.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -338,6 +338,19 @@ void Doc::notifyAfterAddTile(LayerTilemap* layer, frame_t frame, tile_index ti)
   notify_observers<DocEvent&>(&DocObserver::onAfterAddTile, ev);
 }
 
+void Doc::notifyBeforeSlicesDuplication()
+{
+  DocEvent ev(this);
+  notify_observers<DocEvent&>(&DocObserver::onBeforeSlicesDuplication, ev);
+}
+
+void Doc::notifySliceDuplicated(Slice* slice)
+{
+  DocEvent ev(this);
+  ev.slice(slice);
+  notify_observers<DocEvent&>(&DocObserver::onSliceDuplicated, ev);
+}
+
 bool Doc::isModified() const
 {
   return !m_undo->isInSavedStateOrSimilar();

src/app/doc.h

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -141,6 +141,8 @@ public:
   void notifyTilesetChanged(Tileset* tileset);
   void notifyLayerGroupCollapseChange(Layer* layer);
   void notifyAfterAddTile(LayerTilemap* layer, frame_t frame, tile_index ti);
+  void notifyBeforeSlicesDuplication();
+  void notifySliceDuplicated(Slice* slice);
 
   //////////////////////////////////////////////////////////////////////
   // File related properties

src/app/doc_exporter.cpp

@@ -70,6 +70,104 @@ std::string escape_for_json(const std::string& path)
   return res;
 }
 
+// Forward declaration
+void serialize_properties(const doc::UserData::Properties& props, std::ostream& os);
+
+// Helper for a single value
+void serialize_variant(const doc::UserData::Variant& value, std::ostream& os)
+{
+  using Properties = doc::UserData::Properties;
+  switch (value.index()) {
+    case USER_DATA_PROPERTY_TYPE_BOOL: os << (get_value<bool>(value) ? "true" : "false"); break;
+    case USER_DATA_PROPERTY_TYPE_INT8: os << static_cast<int64_t>(get_value<int8_t>(value)); break;
+    case USER_DATA_PROPERTY_TYPE_UINT8:
+      os << static_cast<int64_t>(get_value<uint8_t>(value));
+      break;
+    case USER_DATA_PROPERTY_TYPE_INT16:
+      os << static_cast<int64_t>(get_value<int16_t>(value));
+      break;
+    case USER_DATA_PROPERTY_TYPE_UINT16:
+      os << static_cast<int64_t>(get_value<uint16_t>(value));
+      break;
+    case USER_DATA_PROPERTY_TYPE_INT32:
+      os << static_cast<int64_t>(get_value<int32_t>(value));
+      break;
+    case USER_DATA_PROPERTY_TYPE_UINT32:
+      os << static_cast<int64_t>(get_value<uint32_t>(value));
+      break;
+    case USER_DATA_PROPERTY_TYPE_INT64:
+      os << static_cast<int64_t>(get_value<int64_t>(value));
+      break;
+    case USER_DATA_PROPERTY_TYPE_UINT64:
+      os << static_cast<int64_t>(get_value<uint64_t>(value));
+      break;
+    case USER_DATA_PROPERTY_TYPE_FLOAT:  os << get_value<float>(value); break;
+    case USER_DATA_PROPERTY_TYPE_DOUBLE: os << get_value<double>(value); break;
+    case USER_DATA_PROPERTY_TYPE_STRING:
+      os << "\"" << escape_for_json(get_value<std::string>(value)) << "\"";
+      break;
+    case USER_DATA_PROPERTY_TYPE_PROPERTIES:
+      serialize_properties(get_value<Properties>(value), os);
+      break;
+    default: os << "\"[unsupported type]\""; break;
+  }
+}
+
+// Serializes a map of properties
+void serialize_properties(const doc::UserData::Properties& props, std::ostream& os)
+{
+  os << "{";
+  bool first = true;
+  for (const auto& [key, value] : props) {
+    if (!first)
+      os << ", ";
+    first = false;
+    os << "\"" << escape_for_json(key) << "\": ";
+    serialize_variant(value, os);
+  }
+  os << "}";
+}
+
+void serialize_userdata_properties(const doc::UserData& data, std::ostream& os)
+{
+  const auto& propsMaps = data.propertiesMaps();
+  bool hasAnyProps = false;
+  for (const auto& [group, props] : propsMaps) {
+    if (!props.empty()) {
+      hasAnyProps = true;
+      break;
+    }
+  }
+  if (hasAnyProps) {
+    os << ", \"properties\": {";
+    bool firstProp = true;
+    for (const auto& [group, props] : propsMaps) {
+      if (!props.empty()) {
+        if (!firstProp)
+          os << ", ";
+        firstProp = false;
+        if (group.empty()) {
+          // Default group: flatten its keys at the top level
+          bool firstKey = true;
+          for (const auto& [key, value] : props) {
+            if (!firstKey)
+              os << ", ";
+            firstKey = false;
+            os << "\"" << escape_for_json(key) << "\": ";
+            serialize_variant(value, os);
+          }
+        }
+        else {
+          // Named group: nest under its group name
+          os << "\"" << escape_for_json(group) << "\": ";
+          serialize_properties(props, os);
+        }
+      }
+    }
+    os << "}";
+  }
+}
+
 std::ostream& operator<<(std::ostream& os, const doc::UserData& data)
 {
   doc::color_t color = data.color();
@@ -81,6 +179,9 @@ std::ostream& operator<<(std::ostream& os, const doc::UserData& data)
   }
   if (!data.text().empty())
     os << ", \"data\": \"" << escape_for_json(data.text()) << "\"";
+
+  serialize_userdata_properties(data, os);
+
   return os;
 }
 
@@ -323,7 +424,7 @@ public:
                                  dithering,
                                  sprite ? sprite->rgbMap(0) : nullptr,
                                  sprite ? sprite->palette(0) : nullptr,
-                                 sprite ? sprite->backgroundLayer() : nullptr,
+                                 (sprite && sprite->backgroundLayer()),
                                  0,
                                  0,
                                  nullptr);

src/app/doc_observer.h

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -90,6 +90,8 @@ public:
 
   // Slices
   virtual void onSliceNameChange(DocEvent& ev) {}
+  virtual void onBeforeSlicesDuplication(DocEvent& ev) {}
+  virtual void onSliceDuplicated(DocEvent& ev) {}
 
   // The tileset has changed.
   virtual void onTilesetChanged(DocEvent& ev) {}

src/app/file/gif_format.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2023  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -1095,6 +1095,9 @@ public:
     gifframe_t nframes = totalFrames();
     for (gifframe_t gifFrame = 0; gifFrame < nframes; ++gifFrame) {
       ASSERT(frame_it != frame_end);
+      if (m_fop->isStop())
+        break;
+
       frame_t frame = *frame_it;
       ++frame_it;
 
@@ -1401,7 +1404,7 @@ private:
           color_t color = *srcIt;
           int i;
 
-          if (rgba_geta(color) >= 128) {
+          if (rgba_geta(color) > 0) {
             i = framePalette.findExactMatch(rgba_getr(color),
                                             rgba_getg(color),
                                             rgba_getb(color),

src/app/file/svg_format.cpp

@@ -75,20 +75,86 @@ bool SvgFormat::onSave(FileOp* fop)
   const int pixelScaleValue = std::clamp(svg_options->pixelScale, 0, 10000);
   FileHandle handle(open_file_with_exception_sync_on_close(fop->filename(), "wb"));
   FILE* f = handle.get();
-  auto printcol = [f](int x, int y, int r, int g, int b, int a, int pxScale) {
-    fprintf(f,
-            "<rect x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" fill=\"#%02X%02X%02X\" ",
-            x * pxScale,
-            y * pxScale,
-            pxScale,
-            pxScale,
-            r,
-            g,
-            b);
-    if (a != 255)
-      fprintf(f, "opacity=\"%f\" ", (float)a / 255.0);
-    fprintf(f, "/>\n");
+
+  auto printRect =
+    [f](int x, int y, int width, int height, int r, int g, int b, int a, int pxScale) {
+      fprintf(f,
+              "<rect x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" fill=\"#%02X%02X%02X\" ",
+              x * pxScale,
+              y * pxScale,
+              width * pxScale,
+              height * pxScale,
+              r,
+              g,
+              b);
+      if (a != 255)
+        fprintf(f, "opacity=\"%f\" ", (float)a / 255.0);
+      fprintf(f, "/>\n");
+    };
+
+  // Helper function for greedy merge of same-colored pixels
+  auto mergePixels = [&](auto getPixelColor) {
+    std::vector<std::vector<bool>> processed(image->height(),
+                                             std::vector<bool>(image->width(), false));
+
+    for (y = 0; y < image->height(); y++) {
+      for (x = 0; x < image->width(); x++) {
+        if (processed[y][x])
+          continue;
+
+        auto [pixelR, pixelG, pixelB, pixelA, shouldSkip] = getPixelColor(x, y);
+        if (shouldSkip) {
+          processed[y][x] = true;
+          continue;
+        }
+
+        // Find the largest rectangle starting from this pixel
+        int maxWidth = 0;
+        int maxHeight = 0;
+
+        // Find maximum width for current row
+        for (int w = x; w < image->width(); w++) {
+          if (processed[y][w])
+            break;
+          auto [checkR, checkG, checkB, checkA, skip] = getPixelColor(w, y);
+          if (skip || checkR != pixelR || checkG != pixelG || checkB != pixelB || checkA != pixelA)
+            break;
+          maxWidth = w - x + 1;
+        }
+
+        // Find maximum height with current width
+        for (int h = y; h < image->height(); h++) {
+          bool canExtend = true;
+          for (int w = x; w < x + maxWidth; w++) {
+            if (processed[h][w]) {
+              canExtend = false;
+              break;
+            }
+            auto [checkR, checkG, checkB, checkA, skip] = getPixelColor(w, h);
+            if (skip || checkR != pixelR || checkG != pixelG || checkB != pixelB ||
+                checkA != pixelA) {
+              canExtend = false;
+              break;
+            }
+          }
+          if (!canExtend)
+            break;
+          maxHeight = h - y + 1;
+        }
+
+        // Mark rectangle as processed and output it
+        for (int h = y; h < y + maxHeight; h++) {
+          for (int w = x; w < x + maxWidth; w++) {
+            processed[h][w] = true;
+          }
+        }
+
+        printRect(x, y, maxWidth, maxHeight, pixelR, pixelG, pixelB, pixelA, pixelScaleValue);
+      }
+      fop->setProgress((float)y / (float)(image->height()));
+    }
   };
+
   fprintf(f, "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
   fprintf(
     f,
@@ -98,59 +164,55 @@ bool SvgFormat::onSave(FileOp* fop)
 
   switch (image->pixelFormat()) {
     case IMAGE_RGB: {
-      for (y = 0; y < image->height(); y++) {
-        for (x = 0; x < image->width(); x++) {
-          c = get_pixel_fast<RgbTraits>(image.get(), x, y);
-          alpha = rgba_geta(c);
-          if (alpha != 0x00)
-            printcol(x, y, rgba_getr(c), rgba_getg(c), rgba_getb(c), alpha, pixelScaleValue);
-        }
-        fop->setProgress((float)y / (float)(image->height()));
-      }
+      auto getPixelColor = [&](int px, int py) -> std::tuple<int, int, int, int, bool> {
+        c = get_pixel_fast<RgbTraits>(image.get(), px, py);
+        alpha = rgba_geta(c);
+        if (alpha == 0x00)
+          return { 0, 0, 0, 0, true };
+        return { rgba_getr(c), rgba_getg(c), rgba_getb(c), alpha, false };
+      };
+      mergePixels(getPixelColor);
       break;
     }
     case IMAGE_GRAYSCALE: {
-      for (y = 0; y < image->height(); y++) {
-        for (x = 0; x < image->width(); x++) {
-          c = get_pixel_fast<GrayscaleTraits>(image.get(), x, y);
-          auto v = graya_getv(c);
-          alpha = graya_geta(c);
-          if (alpha != 0x00)
-            printcol(x, y, v, v, v, alpha, pixelScaleValue);
-        }
-        fop->setProgress((float)y / (float)(image->height()));
-      }
+      auto getPixelColor = [&](int px, int py) -> std::tuple<int, int, int, int, bool> {
+        c = get_pixel_fast<GrayscaleTraits>(image.get(), px, py);
+        auto v = graya_getv(c);
+        alpha = graya_geta(c);
+        if (alpha == 0x00)
+          return { 0, 0, 0, 0, true };
+        return { v, v, v, alpha, false };
+      };
+      mergePixels(getPixelColor);
       break;
     }
     case IMAGE_INDEXED: {
       unsigned char image_palette[256][4];
-      for (y = 0; y < 256; y++) {
-        fop->sequenceGetColor(y, &r, &g, &b);
-        image_palette[y][0] = r;
-        image_palette[y][1] = g;
-        image_palette[y][2] = b;
-        fop->sequenceGetAlpha(y, &a);
-        image_palette[y][3] = a;
+      for (int i = 0; i < 256; i++) {
+        fop->sequenceGetColor(i, &r, &g, &b);
+        image_palette[i][0] = r;
+        image_palette[i][1] = g;
+        image_palette[i][2] = b;
+        fop->sequenceGetAlpha(i, &a);
+        image_palette[i][3] = a;
       }
       color_t mask_color = -1;
       if (fop->document()->sprite()->backgroundLayer() == NULL ||
           !fop->document()->sprite()->backgroundLayer()->isVisible()) {
         mask_color = fop->document()->sprite()->transparentColor();
       }
-      for (y = 0; y < image->height(); y++) {
-        for (x = 0; x < image->width(); x++) {
-          c = get_pixel_fast<IndexedTraits>(image.get(), x, y);
-          if (c != mask_color)
-            printcol(x,
-                     y,
-                     image_palette[c][0] & 0xff,
-                     image_palette[c][1] & 0xff,
-                     image_palette[c][2] & 0xff,
-                     image_palette[c][3] & 0xff,
-                     pixelScaleValue);
-        }
-        fop->setProgress((float)y / (float)(image->height()));
-      }
+
+      auto getPixelColor = [&](int px, int py) -> std::tuple<int, int, int, int, bool> {
+        c = get_pixel_fast<IndexedTraits>(image.get(), px, py);
+        if (c == mask_color)
+          return { 0, 0, 0, 0, true };
+        return { image_palette[c][0] & 0xff,
+                 image_palette[c][1] & 0xff,
+                 image_palette[c][2] & 0xff,
+                 image_palette[c][3] & 0xff,
+                 false };
+      };
+      mergePixels(getPixelColor);
       break;
     }
   }

src/app/file_system.cpp

@@ -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
@@ -82,6 +82,9 @@ public:
   unsigned int m_version;
   bool m_removed;
   mutable bool m_is_folder;
+#ifdef _WIN32
+  bool m_isHidden = false;
+#endif
   std::atomic<double> m_thumbnailProgress;
   std::atomic<os::Surface*> m_thumbnail;
 #ifdef _WIN32
@@ -266,7 +269,7 @@ IFileItem* FileSystemModule::getRootFileItem()
     fileitem->m_pidl = pidl;
     fileitem->m_fullpidl = pidl;
 
-    SFGAOF attrib = SFGAO_FOLDER;
+    SFGAOF attrib = SFGAO_FOLDER | SFGAO_HIDDEN;
     shl_idesktop->GetAttributesOf(1, (LPCITEMIDLIST*)&pidl, &attrib);
 
     update_by_pidl(fileitem, attrib);
@@ -357,7 +360,7 @@ bool FileItem::isHidden() const
   ASSERT(m_displayname != NOTINITIALIZED);
 
 #ifdef _WIN32
-  return false;
+  return m_isHidden;
 #else
   return m_displayname[0] == '.';
 #endif
@@ -462,7 +465,7 @@ const FileItemList& FileItem::children()
         // Get the interface to enumerate subitems
         hr = pFolder->EnumObjects(
           reinterpret_cast<HWND>(os::System::instance()->defaultWindow()->nativeHandle()),
-          SHCONTF_FOLDERS | SHCONTF_NONFOLDERS,
+          SHCONTF_FOLDERS | SHCONTF_NONFOLDERS | SHCONTF_INCLUDEHIDDEN,
           &pEnum);
 
         if (hr == S_OK && pEnum) {
@@ -473,10 +476,9 @@ const FileItemList& FileItem::children()
           while (pEnum->Next(256, itempidl, &fetched) == S_OK && fetched > 0) {
             // Request the SFGAO_FOLDER attribute to know what of the
             // item is file or a folder
-            for (c = 0; c < fetched; ++c) {
-              attribs[c] = SFGAO_FOLDER;
-              pFolder->GetAttributesOf(1, (LPCITEMIDLIST*)itempidl, attribs + c);
-            }
+            for (c = 0; c < fetched; ++c)
+              attribs[c] = SFGAO_FOLDER | SFGAO_HIDDEN;
+            pFolder->GetAttributesOf(fetched, (LPCITEMIDLIST*)itempidl, attribs);
 
             // Generate the FileItems
             for (c = 0; c < fetched; ++c) {
@@ -755,6 +757,9 @@ static void update_by_pidl(FileItem* fileitem, SFGAOF attrib)
   // Is it a folder?
 
   fileitem->m_is_folder = calc_is_folder(fileitem->m_filename, attrib);
+  #if _WIN32
+  fileitem->m_isHidden = (attrib & SFGAO_HIDDEN ? true : false);
+  #endif
 
   // Get the name to display
 

src/app/fonts/font_data.cpp

@@ -14,6 +14,7 @@
 #include "text/font.h"
 #include "text/font_mgr.h"
 #include "text/sprite_sheet_font.h"
+#include "text/typeface.h"
 #include "ui/manager.h"
 #include "ui/scale.h"
 

src/app/fonts/font_info.cpp

@@ -11,6 +11,7 @@
 #include "app/fonts/font_info.h"
 
 #include "app/fonts/font_data.h"
+#include "app/i18n/strings.h"
 #include "app/pref/preferences.h"
 #include "base/fs.h"
 #include "base/split_string.h"
@@ -142,19 +143,22 @@ std::string FontInfo::humanString() const
   }
   result += fmt::format(" {}pt", size());
   if (!result.empty()) {
-    if (style().weight() >= text::FontStyle::Weight::SemiBold)
-      result += " Bold";
+    if (style().weight() != text::FontStyle::Weight::Normal)
+      result +=
+        " " +
+        Strings::Translate(
+          fmt::format("font_style.font_weight_{}", static_cast<int>(style().weight())).c_str());
     if (style().slant() != text::FontStyle::Slant::Upright)
-      result += " Italic";
+      result += " " + Strings::font_style_italic();
     if (antialias())
-      result += " Antialias";
+      result += " " + Strings::font_style_antialias();
     if (ligatures())
-      result += " Ligatures";
+      result += " " + Strings::font_style_ligatures();
     switch (hinting()) {
-      case text::FontHinting::None:   result += " No Hinting"; break;
-      case text::FontHinting::Slight: result += " Slight Hinting"; break;
+      case text::FontHinting::None:   result += " " + Strings::font_style_hinting_none(); break;
+      case text::FontHinting::Slight: result += " " + Strings::font_style_hinting_slight(); break;
       case text::FontHinting::Normal: break;
-      case text::FontHinting::Full:   result += " Full Hinting"; break;
+      case text::FontHinting::Full:   result += " " + Strings::font_style_hinting_full(); break;
     }
   }
   return result;
@@ -177,6 +181,7 @@ app::FontInfo convert_to(const std::string& from)
   bool italic = false;
   app::FontInfo::Flags flags = app::FontInfo::Flags::None;
   text::FontHinting hinting = text::FontHinting::Normal;
+  text::FontStyle::Weight weight = text::FontStyle::Weight::Normal;
 
   if (!parts.empty()) {
     if (parts[0].compare(0, 5, "file=") == 0) {
@@ -214,16 +219,17 @@ app::FontInfo convert_to(const std::string& from)
         else if (hintingStr == "full")
           hinting = text::FontHinting::Full;
       }
+      else if (parts[i].compare(0, 7, "weight=") == 0) {
+        std::string weightStr = parts[i].substr(7);
+        weight = static_cast<text::FontStyle::Weight>(std::atoi(weightStr.c_str()));
+      }
     }
   }
 
-  text::FontStyle style;
-  if (bold && italic)
-    style = text::FontStyle::BoldItalic();
-  else if (bold)
-    style = text::FontStyle::Bold();
-  else if (italic)
-    style = text::FontStyle::Italic();
+  const text::FontStyle style(
+    bold ? text::FontStyle::Weight::Bold : weight,
+    text::FontStyle::Width::Normal,
+    italic ? text::FontStyle::Slant::Italic : text::FontStyle::Slant::Upright);
 
   return app::FontInfo(type, name, size, style, flags, hinting);
 }
@@ -243,7 +249,7 @@ std::string convert_to(const app::FontInfo& from)
   if (!result.empty()) {
     if (from.size() > 0.0f)
       result += fmt::format(",size={}", from.size());
-    if (from.style().weight() >= text::FontStyle::Weight::SemiBold)
+    if (from.style().weight() == text::FontStyle::Weight::Bold)
       result += ",bold";
     if (from.style().slant() != text::FontStyle::Slant::Upright)
       result += ",italic";
@@ -262,6 +268,8 @@ std::string convert_to(const app::FontInfo& from)
         case text::FontHinting::Full: result += "full"; break;
       }
     }
+    if (from.style().weight() != text::FontStyle::Weight::Bold)
+      result += ",weight=" + std::to_string(static_cast<int>(from.style().weight()));
   }
   return result;
 }

src/app/modules/gfx.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -219,7 +219,7 @@ void draw_tile(ui::Graphics* g, const Rect& rc, const Site& site, doc::tile_t ti
   int w = tileImage->width();
   int h = tileImage->height();
 
-  os::SurfaceRef surface = os::System::instance()->makeRgbaSurface(w, h);
+  os::SurfaceRef surface = os::System::instance()->makeRgbaSurface(w, h, get_current_color_space());
   convert_image_to_surface(tileImage.get(), get_current_palette(), surface.get(), 0, 0, 0, 0, w, h);
 
   ui::Paint paint;

src/app/modules/gui.cpp

@@ -680,82 +680,77 @@ void CustomizedGuiManager::onNewDisplayConfiguration(Display* display)
 
 bool CustomizedGuiManager::processKey(Message* msg)
 {
-  App* app = App::instance();
   const KeyboardShortcuts* keys = KeyboardShortcuts::instance();
-  const KeyContext contexts[] = { KeyboardShortcuts::getCurrentKeyContext(), KeyContext::Normal };
-  int n = (contexts[0] != contexts[1] ? 2 : 1);
-  for (int i = 0; i < n; ++i) {
-    for (const KeyPtr& key : *keys) {
-      if (key->isPressed(msg, contexts[i])) {
-        // Cancel menu-bar loops (to close any popup menu)
-        app->mainWindow()->getMenuBar()->cancelMenuLoop();
+  const KeyPtr key = keys->findBestKeyFromMessage(msg);
+  if (!key)
+    return false;
 
-        switch (key->type()) {
-          case KeyType::Tool: {
-            tools::Tool* current_tool = app->activeTool();
-            tools::Tool* select_this_tool = key->tool();
-            tools::ToolBox* toolbox = app->toolBox();
-            std::vector<tools::Tool*> possibles;
+  // Cancel menu-bar loops (to close any popup menu)
+  App* app = App::instance();
+  app->mainWindow()->getMenuBar()->cancelMenuLoop();
 
-            // Collect all tools with the pressed keyboard-shortcut
-            for (tools::Tool* tool : *toolbox) {
-              const KeyPtr key = keys->tool(tool);
-              if (key && key->isPressed(msg))
-                possibles.push_back(tool);
-            }
+  switch (key->type()) {
+    case KeyType::Tool: {
+      tools::Tool* current_tool = app->activeTool();
+      tools::Tool* select_this_tool = key->tool();
+      tools::ToolBox* toolbox = app->toolBox();
+      std::vector<tools::Tool*> possibles;
 
-            if (possibles.size() >= 2) {
-              bool done = false;
+      // Collect all tools with the pressed keyboard-shortcut
+      for (tools::Tool* tool : *toolbox) {
+        const KeyPtr key = keys->tool(tool);
+        if (key && key->isPressed(msg))
+          possibles.push_back(tool);
+      }
 
-              for (size_t i = 0; i < possibles.size(); ++i) {
-                if (possibles[i] != current_tool &&
-                    ToolBar::instance()->isToolVisible(possibles[i])) {
-                  select_this_tool = possibles[i];
-                  done = true;
-                  break;
-                }
-              }
+      if (possibles.size() >= 2) {
+        bool done = false;
 
-              if (!done) {
-                for (size_t i = 0; i < possibles.size(); ++i) {
-                  // If one of the possibilities is the current tool
-                  if (possibles[i] == current_tool) {
-                    // We select the next tool in the possibilities
-                    select_this_tool = possibles[(i + 1) % possibles.size()];
-                    break;
-                  }
-                }
-              }
-            }
-
-            ToolBar::instance()->selectTool(select_this_tool);
-            return true;
-          }
-
-          case KeyType::Command: {
-            Command* command = key->command();
-
-            // Commands are executed only when the main window is
-            // the current window running.
-            if (getForegroundWindow() == app->mainWindow()) {
-              // OK, so we can execute the command represented
-              // by the pressed-key in the message...
-              UIContext::instance()->executeCommandFromMenuOrShortcut(command, key->params());
-              return true;
-            }
-            break;
-          }
-
-          case KeyType::Quicktool: {
-            // Do nothing, it is used in the editor through the
-            // KeyboardShortcuts::getCurrentQuicktool() function.
+        for (size_t i = 0; i < possibles.size(); ++i) {
+          if (possibles[i] != current_tool && ToolBar::instance()->isToolVisible(possibles[i])) {
+            select_this_tool = possibles[i];
+            done = true;
             break;
           }
         }
-        break;
+
+        if (!done) {
+          for (size_t i = 0; i < possibles.size(); ++i) {
+            // If one of the possibilities is the current tool
+            if (possibles[i] == current_tool) {
+              // We select the next tool in the possibilities
+              select_this_tool = possibles[(i + 1) % possibles.size()];
+              break;
+            }
+          }
+        }
       }
+
+      ToolBar::instance()->selectTool(select_this_tool);
+      return true;
+    }
+
+    case KeyType::Command: {
+      Command* command = key->command();
+
+      // Commands are executed only when the main window is
+      // the current window running.
+      if (getForegroundWindow() == app->mainWindow()) {
+        // OK, so we can execute the command represented
+        // by the pressed-key in the message...
+        UIContext::instance()->executeCommandFromMenuOrShortcut(command, key->params());
+        return true;
+      }
+      break;
+    }
+
+    case KeyType::Quicktool: {
+      // Do nothing, it is used in the editor through the
+      // KeyboardShortcuts::getCurrentQuicktool() function.
+      break;
     }
   }
+
   return false;
 }
 

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/script/api_version.h

@@ -10,6 +10,6 @@
 
 // Increment this value if the scripting API is modified between two
 // released Aseprite versions.
-#define API_VERSION 33
+#define API_VERSION 35
 
 #endif

src/app/script/app_object.cpp

@@ -34,10 +34,10 @@
 #include "app/tools/tool_loop_manager.h"
 #include "app/tx.h"
 #include "app/ui/context_bar.h"
-#include "app/ui/doc_view.h"
 #include "app/ui/editor/editor.h"
 #include "app/ui/editor/tool_loop_impl.h"
 #include "app/ui/main_window.h"
+#include "app/ui/status_bar.h"
 #include "app/ui/timeline/timeline.h"
 #include "app/ui_context.h"
 #include "base/fs.h"
@@ -498,6 +498,44 @@ int App_useTool(lua_State* L)
   return 0;
 }
 
+int App_tip(lua_State* L)
+{
+  const auto* ctx = App::instance()->context();
+  if (!ctx || !ctx->isUIAvailable() || !StatusBar::instance())
+    return 0; // No UI to show the tooltip
+
+  std::string text;
+  double duration = 2.0;
+
+  if (lua_istable(L, 1)) {
+    int type = lua_getfield(L, 1, "text");
+    if (type == LUA_TSTRING)
+      text = lua_tostring(L, -1);
+    lua_pop(L, 1);
+
+    type = lua_getfield(L, 1, "duration");
+    if (type == LUA_TNUMBER)
+      duration = lua_tonumber(L, -1);
+    lua_pop(L, 1);
+  }
+  else {
+    if (!lua_isstring(L, 1))
+      return luaL_error(L, "app.tip text parameter must be a string");
+
+    text = lua_tostring(L, 1);
+
+    if (lua_isnumber(L, 2))
+      duration = lua_tonumber(L, 2);
+  }
+
+  if (text.empty())
+    return luaL_error(L, "app.tip text cannot be empty");
+
+  int msecs = std::clamp<int>(duration * 1000.0, 500, 30000);
+  StatusBar::instance()->showTip(msecs, text);
+  return 0;
+}
+
 int App_get_events(lua_State* L)
 {
   push_app_events(L);
@@ -820,6 +858,7 @@ const luaL_Reg App_methods[] = {
   { "alert",       App_alert       },
   { "refresh",     App_refresh     },
   { "useTool",     App_useTool     },
+  { "tip",         App_tip         },
   { nullptr,       nullptr         }
 };
 

src/app/script/canvas_widget.cpp

@@ -1,11 +1,12 @@
 // Aseprite
-// Copyright (c) 2022-2024  Igara Studio S.A.
+// Copyright (c) 2022-2025  Igara Studio S.A.
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
 
 #include "app/script/canvas_widget.h"
 
+#include "app/color_spaces.h"
 #include "app/script/graphics_context.h"
 #include "app/ui/skin/skin_theme.h"
 #include "os/system.h"
@@ -45,7 +46,7 @@ void Canvas::callPaint()
     return;
 
   os::Paint p;
-  p.color(bgColor());
+  p.color(bgColor(), m_surface->colorSpace().get());
   m_surface->drawRect(m_surface->bounds(), p);
 
   // Draw only on resize (onPaint we draw the cached m_surface)
@@ -189,7 +190,7 @@ void Canvas::onResize(ui::ResizeEvent& ev)
     }
 
     if (!m_surface || m_surface->width() != w || m_surface->height() != h) {
-      m_surface = system->makeSurface(w, h);
+      m_surface = system->makeSurface(w, h, get_current_color_space());
       callPaint();
     }
   }

src/app/script/dialog_class.cpp

@@ -60,6 +60,8 @@ namespace app { namespace script {
 
 using namespace ui;
 
+static constexpr const int kDefaultAutofit = ui::LEFT | ui::TOP;
+
 namespace {
 
 class DialogWindow : public WindowWithHand {
@@ -107,6 +109,7 @@ struct Dialog {
   std::map<std::string, ui::Widget*> dataWidgets;
   std::map<std::string, ui::Widget*> labelWidgets;
   int currentRadioGroup = 0;
+  int autofit = kDefaultAutofit;
 
   // Member used to hold current state about the creation of a tabs
   // widget. After creation it is reset to null to be ready for the
@@ -127,12 +130,13 @@ struct Dialog {
   int showRef = LUA_REFNIL;
   lua_State* L = nullptr;
 
-  Dialog(const ui::Window::Type windowType, const std::string& title)
+  Dialog(const ui::Window::Type windowType, const std::string& title, bool sizeable)
     : window(windowType, title)
     , grid(2, false)
     , currentGrid(&grid)
   {
     window.addChild(&grid);
+    window.setSizeable(sizeable);
     all_dialogs.push_back(this);
   }
 
@@ -192,12 +196,20 @@ struct Dialog {
       it->second->setText(text);
   }
 
+  void setAutofit(int align)
+  {
+    // Accept both 0 or a valid subset of align parameters.
+    if (align == 0 || (align & (ui::LEFT | ui::RIGHT | ui::TOP | ui::BOTTOM)))
+      autofit = align;
+  }
+
   Display* parentDisplay() const
   {
     Display* parentDisplay = window.parentDisplay();
     if (!parentDisplay) {
-      const auto mainWindow = App::instance()->mainWindow();
-      parentDisplay = mainWindow->display();
+      const auto* mainWindow = App::instance()->mainWindow();
+      if (mainWindow)
+        parentDisplay = mainWindow->display();
     }
     return parentDisplay;
   }
@@ -209,6 +221,9 @@ struct Dialog {
     // origin/scale (or main window if a parent window wasn't specified).
     if (window.ownDisplay()) {
       const Display* parentDisplay = this->parentDisplay();
+      if (!parentDisplay)
+        return bounds;
+
       const int scale = parentDisplay->scale();
       const gfx::Point dialogOrigin = window.display()->nativeWindow()->contentRect().origin();
       const gfx::Point mainOrigin = parentDisplay->nativeWindow()->contentRect().origin();
@@ -223,6 +238,9 @@ struct Dialog {
       window.expandWindow(rc.size());
 
       Display* parentDisplay = this->parentDisplay();
+      if (!parentDisplay)
+        return;
+
       const int scale = parentDisplay->scale();
       const gfx::Point mainOrigin = parentDisplay->nativeWindow()->contentRect().origin();
       gfx::Rect frame = window.display()->nativeWindow()->contentRect();
@@ -230,8 +248,10 @@ struct Dialog {
       window.display()->nativeWindow()->setFrame(frame);
     }
     else {
+      gfx::Rect oldBounds(window.bounds());
       window.setBounds(rc);
       window.invalidate();
+      parentDisplay()->invalidateRect(oldBounds);
     }
   }
 
@@ -365,6 +385,8 @@ int Dialog_new(lua_State* L)
   // Get the title and the type of window (with or without title bar)
   ui::Window::Type windowType = ui::Window::WithTitleBar;
   std::string title = "Script";
+  bool sizeable = true;
+  int autofit = kDefaultAutofit;
   if (lua_isstring(L, 1)) {
     title = lua_tostring(L, 1);
   }
@@ -378,9 +400,21 @@ int Dialog_new(lua_State* L)
     if (type != LUA_TNIL && lua_toboolean(L, -1))
       windowType = ui::Window::WithoutTitleBar;
     lua_pop(L, 1);
+
+    type = lua_getfield(L, 1, "resizeable");
+    if (type != LUA_TNIL && !lua_toboolean(L, -1))
+      sizeable = false;
+    lua_pop(L, 1);
+
+    type = lua_getfield(L, 1, "autofit");
+    if (type != LUA_TNIL) {
+      autofit = lua_tointeger(L, -1);
+    }
+    lua_pop(L, 1);
   }
 
-  auto dlg = push_new<Dialog>(L, windowType, title);
+  auto dlg = push_new<Dialog>(L, windowType, title, sizeable);
+  dlg->setAutofit(autofit);
 
   // The uservalue of the dialog userdata will contain a table that
   // stores all the callbacks to handle events. As these callbacks can
@@ -1509,6 +1543,10 @@ int Dialog_modify(lua_State* L)
     type = lua_getfield(L, 2, "text");
     if (const char* s = lua_tostring(L, -1)) {
       widget->setText(s);
+
+      // Re-process mnemonics for buttons
+      if (widget->type() == WidgetType::kButtonWidget)
+        widget->processMnemonicFromText();
       relayout = true;
     }
     lua_pop(L, 1);
@@ -1626,6 +1664,10 @@ int Dialog_modify(lua_State* L)
     lua_pop(L, 1);
 
     type = lua_getfield(L, 2, "mouseCursor");
+    if (type == LUA_TNIL) {
+      lua_pop(L, 1);
+      type = lua_getfield(L, 2, "mousecursor");
+    }
     if (type != LUA_TNIL) {
       if (auto canvas = dynamic_cast<Canvas*>(widget)) {
         auto cursor = (ui::CursorType)lua_tointeger(L, -1);
@@ -1643,8 +1685,26 @@ int Dialog_modify(lua_State* L)
     if (relayout && !dlg->window.isResizing()) {
       dlg->window.layout();
 
-      gfx::Rect bounds(dlg->window.bounds().w, dlg->window.sizeHint().h);
-      dlg->window.expandWindow(bounds.size());
+      if (dlg->autofit > 0) {
+        gfx::Rect oldBounds = dlg->window.bounds();
+        gfx::Size resize(oldBounds.size());
+
+        if (dlg->autofit & ui::TOP || dlg->autofit & ui::BOTTOM)
+          resize.h = dlg->window.sizeHint().h;
+        if (dlg->autofit & ui::LEFT || dlg->autofit & ui::RIGHT)
+          resize.w = dlg->window.sizeHint().w;
+
+        gfx::Size difference = resize - oldBounds.size();
+        const auto& bounds = dlg->getWindowBounds();
+        gfx::Rect newBounds(bounds.x, bounds.y, resize.w, resize.h);
+
+        if (dlg->autofit & ui::BOTTOM)
+          newBounds.y = bounds.y - difference.h;
+        if (dlg->autofit & ui::RIGHT)
+          newBounds.x = bounds.x - difference.w;
+
+        dlg->setWindowBounds(newBounds);
+      }
     }
   }
   lua_pushvalue(L, 1);
@@ -1866,6 +1926,27 @@ int Dialog_get_bounds(lua_State* L)
   return 1;
 }
 
+int Dialog_get_sizeHint(lua_State* L)
+{
+  auto dlg = get_obj<Dialog>(L, 1);
+  push_new<gfx::Size>(L, dlg->window.sizeHint());
+  return 1;
+}
+
+int Dialog_get_autofit(lua_State* L)
+{
+  auto dlg = get_obj<Dialog>(L, 1);
+  lua_pushinteger(L, dlg->autofit);
+  return 1;
+}
+
+int Dialog_set_autofit(lua_State* L)
+{
+  auto dlg = get_obj<Dialog>(L, 1);
+  dlg->setAutofit(lua_tointeger(L, 2));
+  return 0;
+}
+
 int Dialog_set_bounds(lua_State* L)
 {
   auto dlg = get_obj<Dialog>(L, 1);
@@ -1907,9 +1988,11 @@ const luaL_Reg Dialog_methods[] = {
 };
 
 const Property Dialog_properties[] = {
-  { "data",   Dialog_get_data,   Dialog_set_data   },
-  { "bounds", Dialog_get_bounds, Dialog_set_bounds },
-  { nullptr,  nullptr,           nullptr           }
+  { "data",     Dialog_get_data,     Dialog_set_data    },
+  { "bounds",   Dialog_get_bounds,   Dialog_set_bounds  },
+  { "autofit",  Dialog_get_autofit,  Dialog_set_autofit },
+  { "sizeHint", Dialog_get_sizeHint, nullptr            },
+  { nullptr,    nullptr,             nullptr            }
 };
 
 } // anonymous namespace

src/app/script/engine.cpp

@@ -452,6 +452,7 @@ Engine::Engine() : L(luaL_newstate()), m_delegate(nullptr), m_printLastResult(fa
   lua_setglobal(L, "FlipType");
   setfield_integer(L, "HORIZONTAL", doc::algorithm::FlipType::FlipHorizontal);
   setfield_integer(L, "VERTICAL", doc::algorithm::FlipType::FlipVertical);
+  setfield_integer(L, "DIAGONAL", doc::algorithm::FlipType::FlipDiagonal);
   lua_pop(L, 1);
 
   lua_newtable(L);

src/app/script/events_class.cpp

@@ -370,6 +370,10 @@ public:
 #if ENABLE_REMAP_TILESET_EVENT
     RemapTileset,
 #endif
+    LayerBlendMode,
+    LayerName,
+    LayerOpacity,
+    LayerVisibility,
   };
 
   SpriteEvents(const Sprite* sprite) : m_spriteId(sprite->id()) { doc()->add_observer(this); }
@@ -401,6 +405,14 @@ public:
     else if (std::strcmp(eventName, "remaptileset") == 0)
       return RemapTileset;
 #endif
+    else if (std::strcmp(eventName, "layerblendmode") == 0)
+      return LayerBlendMode;
+    else if (std::strcmp(eventName, "layername") == 0)
+      return LayerName;
+    else if (std::strcmp(eventName, "layeropacity") == 0)
+      return LayerOpacity;
+    else if (std::strcmp(eventName, "layervisibility") == 0)
+      return LayerVisibility;
     else
       return Unknown;
   }
@@ -460,6 +472,38 @@ public:
     });
   }
 
+  void onLayerBlendModeChange(DocEvent& ev) override
+  {
+    call(LayerBlendMode,
+         {
+           { "layer", ev.layer() }
+    });
+  }
+
+  void onLayerNameChange(DocEvent& ev) override
+  {
+    call(LayerName,
+         {
+           { "layer", ev.layer() }
+    });
+  }
+
+  void onLayerOpacityChange(DocEvent& ev) override
+  {
+    call(LayerOpacity,
+         {
+           { "layer", ev.layer() }
+    });
+  }
+
+  void onAfterLayerVisibilityChange(DocEvent& ev) override
+  {
+    call(LayerVisibility,
+         {
+           { "layer", ev.layer() }
+    });
+  }
+
 private:
   void onAddFirstListener(EventType eventType) override
   {

src/app/script/layer_class.cpp

@@ -22,6 +22,7 @@
 #include "app/script/luacpp.h"
 #include "app/script/userdata.h"
 #include "app/tx.h"
+#include "app/ui/timeline/timeline.h"
 #include "doc/layer.h"
 #include "doc/layer_tilemap.h"
 #include "doc/sprite.h"
@@ -355,6 +356,9 @@ int Layer_set_isCollapsed(lua_State* L)
 {
   auto layer = get_docobj<Layer>(L, 1);
   layer->setCollapsed(lua_toboolean(L, 2));
+
+  if (auto* timeline = App::instance()->timeline())
+    timeline->refresh();
   return 0;
 }
 
@@ -362,6 +366,9 @@ int Layer_set_isExpanded(lua_State* L)
 {
   auto layer = get_docobj<Layer>(L, 1);
   layer->setCollapsed(!lua_toboolean(L, 2));
+
+  if (auto* timeline = App::instance()->timeline())
+    timeline->refresh();
   return 0;
 }
 

src/app/script/plugin_class.cpp

@@ -29,11 +29,16 @@ struct Plugin {
 
 class PluginCommand : public Command {
 public:
-  PluginCommand(const std::string& id, const std::string& title, int onclickRef, int onenabledRef)
+  PluginCommand(const std::string& id,
+                const std::string& title,
+                int onclickRef,
+                int onenabledRef,
+                int oncheckedRef)
     : Command(id.c_str(), CmdUIOnlyFlag)
     , m_title(title)
     , m_onclickRef(onclickRef)
     , m_onenabledRef(onenabledRef)
+    , m_oncheckedRef(oncheckedRef)
   {
   }
 
@@ -72,28 +77,42 @@ protected:
   bool onEnabled(Context* context) override
   {
     if (m_onenabledRef) {
-      script::Engine* engine = App::instance()->scriptEngine();
-      lua_State* L = engine->luaState();
-
-      lua_rawgeti(L, LUA_REGISTRYINDEX, m_onenabledRef);
-      if (lua_pcall(L, 0, 1, 0)) {
-        if (const char* s = lua_tostring(L, -1)) {
-          Console().printf("Error: %s", s);
-          return false;
-        }
-      }
-      else {
-        bool ret = lua_toboolean(L, -1);
-        lua_pop(L, 1);
-        return ret;
-      }
+      return callScriptRef(m_onenabledRef);
     }
     return true;
   }
 
+  bool onChecked(Context* context) override
+  {
+    if (m_oncheckedRef) {
+      return callScriptRef(m_oncheckedRef);
+    }
+    return false;
+  }
+
+private:
+  bool callScriptRef(int ref)
+  {
+    ASSERT(ref);
+    script::Engine* engine = App::instance()->scriptEngine();
+    lua_State* L = engine->luaState();
+
+    lua_rawgeti(L, LUA_REGISTRYINDEX, ref);
+    if (lua_pcall(L, 0, 1, 0)) {
+      if (const char* s = lua_tostring(L, -1))
+        Console().printf("Error: %s", s);
+      return false;
+    }
+
+    bool ret = lua_toboolean(L, -1);
+    lua_pop(L, 1);
+    return ret;
+  }
+
   std::string m_title;
   int m_onclickRef;
   int m_onenabledRef;
+  int m_oncheckedRef;
 };
 
 void deleteCommandIfExistent(Extension* ext, const std::string& id)
@@ -126,6 +145,7 @@ int Plugin_newCommand(lua_State* L)
   if (lua_istable(L, 2)) {
     std::string id, title, group;
     int onenabledRef = 0;
+    int oncheckedRef = 0;
 
     lua_getfield(L, 2, "id");
     if (const char* s = lua_tostring(L, -1)) {
@@ -156,6 +176,14 @@ int Plugin_newCommand(lua_State* L)
       lua_pop(L, 1);
     }
 
+    type = lua_getfield(L, 2, "onchecked");
+    if (type == LUA_TFUNCTION) {
+      oncheckedRef = luaL_ref(L, LUA_REGISTRYINDEX); // does a pop
+    }
+    else {
+      lua_pop(L, 1);
+    }
+
     type = lua_getfield(L, 2, "onclick");
     if (type == LUA_TFUNCTION) {
       int onclickRef = luaL_ref(L, LUA_REGISTRYINDEX);
@@ -164,7 +192,7 @@ int Plugin_newCommand(lua_State* L)
       // overwriting a previous registered command)
       deleteCommandIfExistent(plugin->ext, id);
 
-      auto cmd = new PluginCommand(id, title, onclickRef, onenabledRef);
+      auto cmd = new PluginCommand(id, title, onclickRef, onenabledRef, oncheckedRef);
       Commands::instance()->add(cmd);
       plugin->ext->addCommand(id);
 
@@ -172,6 +200,7 @@ int Plugin_newCommand(lua_State* L)
       if (!group.empty() && App::instance()->isGui()) { // On CLI menus do not make sense
         if (auto appMenus = AppMenus::instance()) {
           auto menuItem = std::make_unique<AppMenuItem>(title, id);
+          menuItem->processMnemonicFromText();
           appMenus->addMenuItemIntoGroup(group, std::move(menuItem));
         }
       }

src/app/script/site_class.cpp

@@ -13,6 +13,8 @@
 #include "app/console.h"
 #include "app/context.h"
 #include "app/context_observer.h"
+#include "app/doc.h"
+#include "app/doc_undo.h"
 #include "app/script/docobj.h"
 #include "app/script/engine.h"
 #include "app/script/luacpp.h"

src/app/script/sprite_class.cpp

@@ -64,6 +64,7 @@
 #include "doc/tag.h"
 #include "doc/tileset.h"
 #include "doc/tilesets.h"
+#include "undo/undo_state.h"
 
 #include <algorithm>
 
@@ -456,7 +457,7 @@ int Sprite_newCel(lua_State* L)
   auto sprite = get_docobj<Sprite>(L, 1);
   auto layerBase = get_docobj<Layer>(L, 2);
   if (!layerBase->isImage())
-    return luaL_error(L, "unexpected kinf of layer in Sprite:newCel()");
+    return luaL_error(L, "unexpected kind of layer in Sprite:newCel()");
 
   frame_t frame = get_frame_number_from_arg(L, 3);
   if (frame < 0 || frame > sprite->lastFrame())
@@ -1029,6 +1030,42 @@ int Sprite_set_useLayerUuids(lua_State* L)
   return 0;
 }
 
+int Sprite_get_undoHistory(lua_State* L)
+{
+  const auto* sprite = get_docobj<Sprite>(L, 1);
+  const auto* doc = static_cast<Doc*>(sprite->document());
+  const auto* history = doc->undoHistory();
+
+  if (!history) {
+    lua_pushnil(L);
+    return 1;
+  }
+
+  const undo::UndoState* currentState = history->currentState();
+  const undo::UndoState* s = history->firstState();
+  const bool canRedo = history->canRedo();
+  bool pastCurrent = !currentState && canRedo;
+
+  int undoSteps = 0;
+  int redoSteps = 0;
+  while (s) {
+    if (pastCurrent && canRedo)
+      redoSteps++;
+    else if (currentState || !canRedo)
+      undoSteps++;
+
+    if (s == currentState || !currentState)
+      pastCurrent = true;
+
+    s = s->next();
+  }
+
+  lua_newtable(L);
+  setfield_integer(L, "undoSteps", undoSteps);
+  setfield_integer(L, "redoSteps", redoSteps);
+  return 1;
+}
+
 const luaL_Reg Sprite_methods[] = {
   { "__eq",              Sprite_eq                },
   { "resize",            Sprite_resize            },
@@ -1094,6 +1131,7 @@ const Property Sprite_properties[] = {
   { "events",               Sprite_get_events,               nullptr                         },
   { "tileManagementPlugin", Sprite_get_tileManagementPlugin, Sprite_set_tileManagementPlugin },
   { "useLayerUuids",        Sprite_get_useLayerUuids,        Sprite_set_useLayerUuids        },
+  { "undoHistory",          Sprite_get_undoHistory,          nullptr                         },
   { nullptr,                nullptr,                         nullptr                         }
 };
 

src/app/script/values.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019-2024  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.

src/app/thumbnails.cpp

@@ -10,6 +10,7 @@
   #include "config.h"
 #endif
 
+#include "app/color_spaces.h"
 #include "app/util/conversion_to_surface.h"
 #include "doc/blend_mode.h"
 #include "doc/cel.h"
@@ -55,7 +56,8 @@ os::SurfaceRef get_cel_thumbnail(const doc::Cel* cel,
 
   if (os::SurfaceRef thumbnail = os::System::instance()->makeRgbaSurface(
         thumbnailImage->width(),
-        thumbnailImage->height())) {
+        thumbnailImage->height(),
+        get_current_color_space())) {
     convert_image_to_surface(thumbnailImage.get(),
                              palette,
                              thumbnail.get(),

src/app/ui/context_bar.cpp

@@ -1001,12 +1001,12 @@ public:
     m_angle.setSuffix("°");
     m_skew.setSuffix("°");
 
-    addChild(new Label("P:"));
+    addChild(new Label(Strings::context_bar_position_label()));
     addChild(&m_x);
     addChild(&m_y);
     addChild(&m_w);
     addChild(&m_h);
-    addChild(new Label("R:"));
+    addChild(new Label(Strings::context_bar_rotation_label()));
     addChild(&m_angle);
     addChild(&m_skew);
 
@@ -1047,6 +1047,16 @@ public:
     m_skew.Change.connect([this] { onChangeSkew(); });
   }
 
+  void setupTooltips(TooltipManager* tooltipManager)
+  {
+    tooltipManager->addTooltipFor(&m_x, Strings::context_bar_position_x(), BOTTOM);
+    tooltipManager->addTooltipFor(&m_y, Strings::context_bar_position_y(), BOTTOM);
+    tooltipManager->addTooltipFor(&m_w, Strings::context_bar_size_width(), BOTTOM);
+    tooltipManager->addTooltipFor(&m_h, Strings::context_bar_size_height(), BOTTOM);
+    tooltipManager->addTooltipFor(&m_angle, Strings::context_bar_rotation_angle(), BOTTOM);
+    tooltipManager->addTooltipFor(&m_skew, Strings::context_bar_rotation_skew(), BOTTOM);
+  }
+
   void update(const Transformation& t)
   {
     auto rc = t.bounds();
@@ -1380,11 +1390,12 @@ public:
 
 class ContextBar::DropPixelsField : public ButtonSet {
 public:
-  DropPixelsField() : ButtonSet(2)
+  DropPixelsField() : ButtonSet(3)
   {
     auto* theme = SkinTheme::get(this);
 
     addItem(theme->parts.dropPixelsOk(), theme->styles.contextBarButton());
+    addItem(theme->parts.dropPixelsDrop(), theme->styles.contextBarButton());
     addItem(theme->parts.dropPixelsCancel(), theme->styles.contextBarButton());
     setOfferCapture(false);
   }
@@ -1392,8 +1403,26 @@ public:
   void setupTooltips(TooltipManager* tooltipManager)
   {
     // TODO Enter and Esc should be configurable keys
-    tooltipManager->addTooltipFor(at(0), Strings::context_bar_drop_pixel(), BOTTOM);
-    tooltipManager->addTooltipFor(at(1), Strings::context_bar_cancel_drag(), BOTTOM);
+
+    tooltipManager->addTooltipFor(
+      at(0),
+      key_tooltip(Strings::context_bar_drop_pixel_and_deselect().c_str(),
+                  CommandId::DeselectMask(),
+                  {},
+                  KeyContext::Transformation),
+      BOTTOM);
+    tooltipManager->addTooltipFor(at(1),
+                                  key_tooltip(Strings::context_bar_drop_pixel().c_str(),
+                                              CommandId::Apply(),
+                                              {},
+                                              KeyContext::Transformation),
+                                  BOTTOM);
+    tooltipManager->addTooltipFor(at(2),
+                                  key_tooltip(Strings::context_bar_cancel_drag().c_str(),
+                                              CommandId::Undo(),
+                                              {},
+                                              KeyContext::Transformation),
+                                  BOTTOM);
   }
 
   obs::signal<void(ContextBarObserver::DropAction)> DropPixels;
@@ -1404,8 +1433,9 @@ protected:
     ButtonSet::onItemChange(item);
 
     switch (selectedItem()) {
-      case 0: DropPixels(ContextBarObserver::DropPixels); break;
-      case 1: DropPixels(ContextBarObserver::CancelDrag); break;
+      case 0: DropPixels(ContextBarObserver::Deselect); break;
+      case 1: DropPixels(ContextBarObserver::DropPixels); break;
+      case 2: DropPixels(ContextBarObserver::CancelDrag); break;
     }
   }
 };
@@ -1857,7 +1887,7 @@ private:
 
 class ContextBar::FontSelector : public FontEntry {
 public:
-  FontSelector(ContextBar* contextBar)
+  FontSelector(ContextBar* contextBar) : FontEntry(true) // With stroke and fill options
   {
     // Load the font from the preferences
     setInfo(FontInfo::getFromPreferences(), FontEntry::From::Init);
@@ -2559,6 +2589,11 @@ FontInfo ContextBar::fontInfo() const
   return m_fontSelector->info();
 }
 
+FontEntry* ContextBar::fontEntry()
+{
+  return m_fontSelector;
+}
+
 render::DitheringMatrix ContextBar::ditheringMatrix()
 {
   return m_ditheringSelector->ditheringMatrix();
@@ -2621,6 +2656,7 @@ void ContextBar::setupTooltips(TooltipManager* tooltipManager)
   m_dropPixels->setupTooltips(tooltipManager);
   m_symmetry->setupTooltips(tooltipManager);
   m_sliceFields->setupTooltips(tooltipManager);
+  m_transformation->setupTooltips(tooltipManager);
 }
 
 void ContextBar::registerCommands()

src/app/ui/context_bar.h

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
@@ -90,6 +90,7 @@ public:
 
   // For text tool
   FontInfo fontInfo() const;
+  FontEntry* fontEntry();
 
   // For gradients
   render::DitheringMatrix ditheringMatrix();

src/app/ui/context_bar_observer.h

@@ -1,4 +1,5 @@
 // Aseprite
+// Copyright (C) 2025  Igara Studio S.A.
 // Copyright (C) 2001-2015  David Capello
 //
 // This program is distributed under the terms of
@@ -12,7 +13,7 @@ namespace app {
 
 class ContextBarObserver {
 public:
-  enum DropAction { DropPixels, CancelDrag };
+  enum DropAction { Deselect, DropPixels, CancelDrag };
 
   virtual ~ContextBarObserver() {}
   virtual void onDropPixels(DropAction action) {}

src/app/ui/doc_view.cpp

@@ -36,12 +36,15 @@
 #include "app/ui/workspace.h"
 #include "app/ui_context.h"
 #include "app/util/clipboard.h"
+#include "app/util/slice_utils.h"
 #include "base/fs.h"
 #include "doc/color.h"
 #include "doc/layer.h"
+#include "doc/slice.h"
 #include "doc/sprite.h"
 #include "fmt/format.h"
 #include "ui/alert.h"
+#include "ui/display.h"
 #include "ui/menu.h"
 #include "ui/message.h"
 #include "ui/shortcut.h"
@@ -306,6 +309,11 @@ bool DocView::onCloseView(Workspace* workspace, bool quitting)
 
     // See if the sprite has changes
     while (m_document->isModified()) {
+      if (quitting) {
+        // Make sure the window is active so we can see the message when we close the app.
+        display()->nativeWindow()->activate();
+      }
+
       // ask what want to do the user with the changes in the sprite
       int ret = Alert::show(Strings::alerts_save_sprite_changes(
         m_document->name(),
@@ -510,6 +518,8 @@ bool DocView::onCanCopy(Context* ctx)
     return true;
   else if (m_editor->isMovingPixels())
     return true;
+  else if (m_editor->hasSelectedSlices())
+    return true;
   else
     return false;
 }
@@ -528,6 +538,11 @@ bool DocView::onCanPaste(Context* ctx)
       return true;
     }
   }
+
+  if (ctx->checkFlags(ContextFlags::ActiveDocumentIsWritable) &&
+      ctx->clipboard()->format() == ClipboardFormat::Slices) {
+    return true;
+  }
   return false;
 }
 
@@ -560,15 +575,22 @@ bool DocView::onCopy(Context* ctx)
     ctx->clipboard()->copy(reader);
     return true;
   }
-  else
-    return false;
+
+  std::vector<Slice*> selectedSlices = get_selected_slices(reader.site());
+  if (!selectedSlices.empty()) {
+    ctx->clipboard()->copySlices(selectedSlices);
+    return true;
+  }
+
+  return false;
 }
 
 bool DocView::onPaste(Context* ctx, const gfx::Point* position)
 {
   auto clipboard = ctx->clipboard();
   if (clipboard->format() == ClipboardFormat::Image ||
-      clipboard->format() == ClipboardFormat::Tilemap) {
+      clipboard->format() == ClipboardFormat::Tilemap ||
+      clipboard->format() == ClipboardFormat::Slices) {
     clipboard->paste(ctx, true, position);
     return true;
   }

src/app/ui/editor/brush_preview.cpp

@@ -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
@@ -457,6 +457,8 @@ void BrushPreview::show(const gfx::Point& screenPos)
 
       // Here we re-use the cached surface
       if (!cached && m_uiLayer->surface()) {
+        m_uiLayer->surface()->clear();
+
         gfx::Rect layerBounds = m_uiLayer->surface()->bounds();
         ui::Graphics g(display, m_uiLayer->surface(), 0, 0);
 

src/app/ui/editor/editor.cpp

@@ -58,6 +58,7 @@
 #include "app/util/tile_flags_utils.h"
 #include "base/chrono.h"
 #include "base/convert_to.h"
+#include "base/scoped_value.h"
 #include "doc/doc.h"
 #include "doc/mask_boundaries.h"
 #include "doc/slice.h"
@@ -266,6 +267,23 @@ void Editor::setStateInternal(const EditorStatePtr& newState)
 {
   m_brushPreview.hide();
 
+  // Some onLeaveState impls (like the ones from MovingPixelsState,
+  // WritingTextState, MovingSelectionState) might generate a
+  // Tx/Transaction::commit(), which will add a new undo state,
+  // triggering a sprite change scripting event
+  // (SpriteEvents::onAddUndoState). This event could be handled by an
+  // extension and that extension might want to save the current
+  // sprite (e.g. calling Sprite_saveCopyAs, the kind of extension
+  // that takes snapshots after each sprite change). That will be a
+  // new Context::executeCommand() for the save command, generating a
+  // BeforeCommandExecution signal, getting back to onLeaveState
+  // again. In that case, we just ignore the reentry as the first
+  // onLeaveState should handle everything (to avoid an stack
+  // overflow/infinite recursion).
+  if (m_leavingState)
+    return;
+  base::ScopedValue leaving(m_leavingState, true);
+
   // Fire before change state event, set the state, and fire after
   // change state event.
   EditorState::LeaveAction leaveAction = m_state->onLeaveState(this, newState.get());
@@ -2537,6 +2555,16 @@ void Editor::onBeforeLayerEditableChange(DocEvent& ev, bool newState)
     m_state->onBeforeLayerEditableChange(this, ev.layer(), newState);
 }
 
+void Editor::onBeforeSlicesDuplication(DocEvent& ev)
+{
+  clearSlicesSelection();
+}
+
+void Editor::onSliceDuplicated(DocEvent& ev)
+{
+  selectSlice(ev.slice());
+}
+
 void Editor::setCursor(const gfx::Point& mouseDisplayPos)
 {
   bool used = false;

src/app/ui/editor/editor.h

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -343,6 +343,8 @@ protected:
   void onRemoveSlice(DocEvent& ev) override;
   void onBeforeLayerVisibilityChange(DocEvent& ev, bool newState) override;
   void onBeforeLayerEditableChange(DocEvent& ev, bool newState) override;
+  void onBeforeSlicesDuplication(DocEvent& ev) override;
+  void onSliceDuplicated(DocEvent& ev) override;
 
   // ActiveToolObserver impl
   void onActiveToolChange(tools::Tool* tool) override;
@@ -458,6 +460,13 @@ private:
 
   DocView* m_docView;
 
+  // Special flag to avoid re-entering a new state when we are leaving
+  // the current one. This avoids an infinite onLeaveState() recursion
+  // in some special cases when an extension (third-party code)
+  // creates a new sprite change in the same sprite change scripting
+  // event.
+  bool m_leavingState = false;
+
   // Last known mouse position received by this editor when the
   // mouse button was pressed. Used for auto-scrolling. To get the
   // current mouse position on the editor you can use

src/app/ui/editor/moving_pixels_state.cpp

@@ -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
@@ -22,6 +22,7 @@
 #include "app/commands/commands.h"
 #include "app/commands/move_thing.h"
 #include "app/console.h"
+#include "app/i18n/strings.h"
 #include "app/modules/gui.h"
 #include "app/pref/preferences.h"
 #include "app/tools/ink.h"
@@ -48,6 +49,7 @@
 #include "fmt/format.h"
 #include "gfx/rect.h"
 #include "ui/manager.h"
+#include "ui/menu.h"
 #include "ui/message.h"
 #include "ui/system.h"
 #include "ui/view.h"
@@ -286,9 +288,6 @@ bool MovingPixelsState::onMouseDown(Editor* editor, MouseMessage* msg)
   UIContext* ctx = UIContext::instance();
   ctx->setActiveView(editor->getDocView());
 
-  ContextBar* contextBar = App::instance()->contextBar();
-  contextBar->updateForMovingPixels(getTransformation(editor));
-
   // Start scroll loop
   if (editor->checkForScroll(msg) || editor->checkForZoom(msg))
     return true;
@@ -442,10 +441,6 @@ void MovingPixelsState::onCommitMouseMove(Editor* editor, const gfx::PointF& spr
   // Drag the image to that position
   m_pixelsMovement->moveImage(spritePos, moveModifier);
 
-  // Update context bar and status bar
-  ContextBar* contextBar = App::instance()->contextBar();
-  contextBar->updateForMovingPixels(transformation);
-
   m_editor->updateStatusBar();
 }
 
@@ -475,19 +470,6 @@ bool MovingPixelsState::onKeyDown(Editor* editor, KeyMessage* msg)
   // FineControl now (e.g. if we pressed another modifier key).
   m_lockedKeyAction = KeyAction::None;
 
-  if (msg->scancode() == kKeyEnter || // TODO make this key customizable
-      msg->scancode() == kKeyEnterPad || msg->scancode() == kKeyEsc) {
-    dropPixels();
-
-    // The escape key drop pixels and deselect the mask.
-    if (msg->scancode() == kKeyEsc) { // TODO make this key customizable
-      Command* cmd = Commands::instance()->byId(CommandId::DeselectMask());
-      UIContext::instance()->executeCommandFromMenuOrShortcut(cmd);
-    }
-
-    return true;
-  }
-
   // Use StandbyState implementation
   return StandbyState::onKeyDown(editor, msg);
 }
@@ -529,6 +511,10 @@ bool MovingPixelsState::onUpdateStatusBar(Editor* editor)
   const Transformation& transform(getTransformation(editor));
   gfx::Size imageSize = m_pixelsMovement->getInitialImageSize();
 
+  // Update the context bar along with the status bar
+  ContextBar* contextBar = App::instance()->contextBar();
+  contextBar->updateForMovingPixels(transform);
+
   int w = int(transform.bounds().w);
   int h = int(transform.bounds().h);
   int gcd = base::gcd(w, h);
@@ -634,6 +620,12 @@ void MovingPixelsState::onBeforeCommandExecution(CommandExecutionEvent& ev)
       return;
     }
   }
+  // Handle undo directly as cancelDrag() to avoid adding an action in the history.
+  else if (command->id() == CommandId::Undo()) {
+    cancelDrag();
+    ev.cancel();
+    return;
+  }
   // Don't drop pixels if the user zooms/scrolls/picks a color
   // using commands.
   else if ((command->id() == CommandId::Zoom()) || (command->id() == CommandId::Scroll()) ||
@@ -795,18 +787,35 @@ void MovingPixelsState::onDropPixels(ContextBarObserver::DropAction action)
     return;
 
   switch (action) {
+    case ContextBarObserver::Deselect:   deselect(); break;
     case ContextBarObserver::DropPixels: dropPixels(); break;
-
-    case ContextBarObserver::CancelDrag:
-      m_pixelsMovement->discardImage(PixelsMovement::DontCommitChanges);
-      m_discarded = true;
-
-      // Quit from MovingPixelsState, back to standby.
-      m_editor->backToPreviousState();
-      break;
+    case ContextBarObserver::CancelDrag: cancelDrag(); break;
   }
 }
 
+void MovingPixelsState::deselect()
+{
+  if (!m_pixelsMovement || m_discarded)
+    return;
+
+  dropPixels();
+
+  Command* cmd = Commands::instance()->byId(CommandId::DeselectMask());
+  UIContext::instance()->executeCommandFromMenuOrShortcut(cmd);
+}
+
+void MovingPixelsState::cancelDrag()
+{
+  if (!m_pixelsMovement || m_discarded)
+    return;
+
+  m_pixelsMovement->discardImage(PixelsMovement::DontCommitChanges);
+  m_discarded = true;
+
+  // Quit from MovingPixelsState, back to standby.
+  dropPixels();
+}
+
 void MovingPixelsState::onPivotChange()
 {
   ContextBar* contextBar = App::instance()->contextBar();

src/app/ui/editor/moving_pixels_state.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-2017  David Capello
 //
 // This program is distributed under the terms of
@@ -94,7 +94,10 @@ private:
   void onBeforeCommandExecution(CommandExecutionEvent& ev);
 
   void setTransparentColor(bool opaque, const app::Color& color);
+
+  void deselect();
   void dropPixels();
+  void cancelDrag();
 
   bool isActiveDocument() const;
   bool isActiveEditor() const;

src/app/ui/editor/moving_slice_state.cpp

@@ -428,8 +428,8 @@ bool MovingSliceState::onMouseMove(Editor* editor, MouseMessage* msg)
   if (editor->slicesTransforms())
     drawExtraCel();
 
-  // Redraw the editor.
-  editor->invalidate();
+  // Notify changes
+  m_site.document()->notifyGeneralUpdate();
 
   // Use StandbyState implementation
   return StandbyState::onMouseMove(editor, msg);

src/app/ui/editor/pixels_movement.cpp

@@ -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
@@ -420,10 +420,12 @@ void PixelsMovement::moveImage(const gfx::PointF& pos, MoveModifier moveModifier
         // Now we calculate the difference from x1,y1 point and we can
         // use it to adjust all coordinates (x1, y1, x2, y2).
         bounds.setOrigin(gridOffset);
+        newTransformation.pivot(abs_initial_pivot - m_initialData.bounds().origin() + gridOffset);
       }
+      else
+        newTransformation.pivot(abs_initial_pivot + gfx::PointF(dx, dy));
 
       newTransformation.bounds(bounds);
-      newTransformation.pivot(abs_initial_pivot + gfx::PointF(dx, dy));
       break;
     }
 

src/app/ui/editor/state_with_wheel_behavior.cpp

@@ -74,7 +74,11 @@ bool StateWithWheelBehavior::onMouseWheel(Editor* editor, MouseMessage* msg)
   double dz = delta.x + delta.y;
   WheelAction wheelAction = WheelAction::None;
 
-  if (KeyboardShortcuts::instance()->hasMouseWheelCustomization()) {
+  if (tools::Tool* quickTool = App::instance()->activeToolManager()->quickTool();
+      quickTool && quickTool->getId() == tools::WellKnownInks::Zoom) {
+    wheelAction = WheelAction::Zoom;
+  }
+  else if (KeyboardShortcuts::instance()->hasMouseWheelCustomization()) {
     if (!Preferences::instance().editor.zoomWithSlide() && msg->preciseWheel())
       wheelAction = WheelAction::VScroll;
     else

src/app/ui/editor/tool_loop_impl.cpp

@@ -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
@@ -45,6 +45,7 @@
 #include "app/ui_context.h"
 #include "app/util/expand_cel_canvas.h"
 #include "app/util/layer_utils.h"
+#include "app/util/slice_utils.h"
 #include "doc/brush.h"
 #include "doc/cel.h"
 #include "doc/image.h"
@@ -693,7 +694,7 @@ public:
       // popup menu to create a new one.
       if (!m_editor->selectSliceBox(bounds) && (bounds.w > 1 || bounds.h > 1)) {
         Slice* slice = new Slice;
-        slice->setName(getUniqueSliceName());
+        slice->setName(get_unique_slice_name(m_sprite));
 
         SliceKey key(bounds);
         slice->insert(getFrame(), key);
@@ -716,18 +717,6 @@ private:
   // EditorObserver impl
   void onScrollChanged(Editor* editor) override { updateAllVisibleRegion(); }
   void onZoomChanged(Editor* editor) override { updateAllVisibleRegion(); }
-
-  std::string getUniqueSliceName() const
-  {
-    std::string prefix = "Slice";
-    int max = 0;
-
-    for (Slice* slice : m_sprite->slices())
-      if (std::strncmp(slice->name().c_str(), prefix.c_str(), prefix.size()) == 0)
-        max = std::max(max, (int)std::strtol(slice->name().c_str() + prefix.size(), nullptr, 10));
-
-    return fmt::format("{} {}", prefix, max + 1);
-  }
 };
 
 //////////////////////////////////////////////////////////////////////

src/app/ui/editor/transform_handles.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2020-2022  Igara Studio S.A.
+// Copyright (C) 2020-2025  Igara Studio S.A.
 // Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
@@ -209,7 +209,8 @@ gfx::Rect TransformHandles::getPivotHandleBounds(Editor* editor,
 {
   auto theme = SkinTheme::get(editor);
   gfx::Size partSize = theme->parts.pivotHandle()->size();
-  gfx::Point screenPivotPos = editor->editorToScreen(gfx::Point(transform.pivot()));
+  gfx::Point pivotPos = gfx::Point(transform.pivot()) + editor->mainTilePosition();
+  gfx::Point screenPivotPos = editor->editorToScreen(pivotPos);
 
   screenPivotPos.x += editor->projection().applyX(1) / 2;
   screenPivotPos.y += editor->projection().applyY(1) / 2;

src/app/ui/editor/writing_text_state.cpp

@@ -15,6 +15,7 @@
 #include "app/commands/command.h"
 #include "app/extra_cel.h"
 #include "app/fonts/font_info.h"
+#include "app/i18n/strings.h"
 #include "app/pref/preferences.h"
 #include "app/site.h"
 #include "app/tx.h"
@@ -43,12 +44,42 @@
   #include "os/skia/skia_surface.h"
 #endif
 
+#include <cmath>
+
 namespace app {
 
 using namespace ui;
 
+// Get ui::Paint to render text from context bar options / preferences
+static ui::Paint get_paint_for_text()
+{
+  ui::Paint paint;
+  if (auto* app = App::instance()) {
+    if (auto* ctxBar = app->contextBar())
+      paint = ctxBar->fontEntry()->paint();
+  }
+  paint.color(color_utils::color_for_ui(Preferences::instance().colorBar.fgColor()));
+  return paint;
+}
+
+static gfx::RectF calc_blob_bounds(const text::TextBlobRef& blob)
+{
+  gfx::RectF bounds = get_text_blob_required_bounds(blob);
+  ui::Paint paint = get_paint_for_text();
+  if (paint.style() == ui::Paint::Style::Stroke ||
+      paint.style() == ui::Paint::Style::StrokeAndFill) {
+    bounds.enlarge(std::ceil(paint.strokeWidth()));
+  }
+  return bounds;
+}
+
 class WritingTextState::TextEditor : public Entry {
 public:
+  enum TextPreview {
+    Intermediate, // With selection preview / user interface
+    Final,        // Final to be rendered in the cel
+  };
+
   TextEditor(Editor* editor, const Site& site, const gfx::Rect& bounds)
     : Entry(4096, "")
     , m_editor(editor)
@@ -61,7 +92,7 @@ public:
     setPersistSelection(true);
 
     createExtraCel(site, bounds);
-    renderExtraCelBase();
+    renderExtraCel(TextPreview::Intermediate);
 
     FontInfo fontInfo = App::instance()->contextBar()->fontInfo();
     if (auto font = Fonts::instance()->fontFromInfo(fontInfo))
@@ -76,35 +107,37 @@ public:
 
   // Returns the extra cel with the text rendered (but without the
   // selected text highlighted).
-  ExtraCelRef extraCel()
+  ExtraCelRef extraCel(const TextPreview textPreview)
   {
-    renderExtraCelBase();
-    renderExtraCelText(false);
+    renderExtraCel(textPreview);
     return m_extraCel;
   }
 
-  void setExtraCelBounds(const gfx::Rect& bounds)
+  void setExtraCelBounds(const gfx::RectF& bounds)
   {
-    if (bounds.w != m_extraCel->image()->width() || bounds.h != m_extraCel->image()->height()) {
+    doc::Image* extraImg = m_extraCel->image();
+    if (!extraImg || std::ceil(bounds.w) != extraImg->width() ||
+        std::ceil(bounds.h) != extraImg->height()) {
       createExtraCel(m_editor->getSite(), bounds);
     }
     else {
+      m_baseBounds = bounds;
       m_extraCel->cel()->setBounds(bounds);
     }
-    renderExtraCelBase();
-    renderExtraCelText(true);
+    renderExtraCel(TextPreview::Intermediate);
   }
 
-  obs::signal<void(const gfx::Size&)> NewRequiredBounds;
+  obs::signal<void(const gfx::RectF&)> NewRequiredBounds;
 
 private:
   void createExtraCel(const Site& site, const gfx::Rect& bounds)
   {
+    m_baseBounds = bounds;
     m_extraCel->create(ExtraCel::Purpose::TextPreview,
                        site.tilemapMode(),
                        site.sprite(),
                        bounds,
-                       bounds.size(),
+                       gfx::Size(std::ceil(bounds.w), std::ceil(bounds.h)),
                        site.frame(),
                        255);
 
@@ -175,7 +208,7 @@ private:
 
     // Notify that we could make the text editor bigger to show this
     // text blob.
-    NewRequiredBounds(get_text_blob_required_size(blob));
+    NewRequiredBounds(calc_blob_bounds(blob));
   }
 
   void onPaint(PaintEvent& ev) override
@@ -204,8 +237,7 @@ private:
       }
 
       // Render extra cel with text + selected text
-      renderExtraCelBase();
-      renderExtraCelText(true);
+      renderExtraCel(TextPreview::Intermediate);
       m_doc->setExtraCel(m_extraCel);
 
       // Paint caret
@@ -226,62 +258,80 @@ private:
     }
   }
 
-  void renderExtraCelBase()
+  void renderExtraCel(const TextPreview textPreview)
   {
-    auto extraImg = m_extraCel->image();
-    extraImg->clear(extraImg->maskColor());
-    render::Render().renderLayer(extraImg,
-                                 m_editor->layer(),
-                                 m_editor->frame(),
-                                 gfx::Clip(0, 0, m_extraCel->cel()->bounds()),
-                                 doc::BlendMode::SRC);
-  }
+    doc::Image* extraImg = m_extraCel->image();
+    ASSERT(extraImg);
+    if (!extraImg)
+      return;
 
-  void renderExtraCelText(const bool withSelection)
-  {
-    const auto textColor = color_utils::color_for_image(Preferences::instance().colorBar.fgColor(),
-                                                        IMAGE_RGB);
+    extraImg->clear(extraImg->maskColor());
 
     text::TextBlobRef blob = textBlob();
-    if (!blob)
-      return;
+    doc::ImageRef blobImage;
+    gfx::RectF bounds;
+    if (blob) {
+      const ui::Paint paint = get_paint_for_text();
+      bounds = calc_blob_bounds(blob);
+      blobImage = render_text_blob(blob, bounds, get_paint_for_text());
+      if (!blobImage)
+        return;
 
-    doc::ImageRef image = render_text_blob(blob, textColor);
-    if (!image)
-      return;
+      // Invert selected range in the image
+      if (textPreview == TextPreview::Intermediate) {
+        Range range;
+        getEntryThemeInfo(nullptr, nullptr, nullptr, &range);
+        if (!range.isEmpty()) {
+          gfx::RectF selectedBounds = getCharBoxBounds(range.from) | getCharBoxBounds(range.to - 1);
 
-    // Invert selected range in the image
-    if (withSelection) {
-      Range range;
-      getEntryThemeInfo(nullptr, nullptr, nullptr, &range);
-      if (!range.isEmpty()) {
-        gfx::RectF selectedBounds = getCharBoxBounds(range.from) | getCharBoxBounds(range.to - 1);
+          if (!selectedBounds.isEmpty()) {
+            selectedBounds.offset(-bounds.origin());
 
-        if (!selectedBounds.isEmpty()) {
 #ifdef LAF_SKIA
-          sk_sp<SkSurface> skSurface = wrap_docimage_in_sksurface(image.get());
-          os::SurfaceRef surface = base::make_ref<os::SkiaSurface>(skSurface);
+            sk_sp<SkSurface> skSurface = wrap_docimage_in_sksurface(blobImage.get());
+            os::SurfaceRef surface = base::make_ref<os::SkiaSurface>(skSurface);
 
-          os::Paint paint;
-          paint.blendMode(os::BlendMode::Xor);
-          paint.color(textColor);
-          surface->drawRect(selectedBounds, paint);
+            os::Paint paint2 = paint;
+            paint2.blendMode(os::BlendMode::Xor);
+            paint2.style(os::Paint::Style::Fill);
+            surface->drawRect(selectedBounds, paint2);
 #endif // LAF_SKIA
+          }
         }
       }
     }
 
-    doc::blend_image(m_extraCel->image(),
-                     image.get(),
-                     gfx::Clip(image->bounds().size()),
-                     m_doc->sprite()->palette(m_editor->frame()),
-                     255,
-                     doc::BlendMode::NORMAL);
+    doc::Cel* extraCel = m_extraCel->cel();
+    ASSERT(extraCel);
+    if (!extraCel)
+      return;
+
+    extraCel->setPosition(m_baseBounds.x + bounds.x, m_baseBounds.y + bounds.y);
+
+    render::Render().renderLayer(extraImg,
+                                 m_editor->layer(),
+                                 m_editor->frame(),
+                                 gfx::Clip(0, 0, extraCel->bounds()),
+                                 doc::BlendMode::SRC);
+
+    if (blobImage) {
+      doc::blend_image(extraImg,
+                       blobImage.get(),
+                       gfx::Clip(blobImage->bounds().size()),
+                       m_doc->sprite()->palette(m_editor->frame()),
+                       255,
+                       doc::BlendMode::NORMAL);
+    }
   }
 
   Editor* m_editor;
   Doc* m_doc;
   ExtraCelRef m_extraCel;
+
+  // Initial bounds for the entry field. This can be modified later to
+  // render the text in case some initial letter/glyph needs some
+  // extra room at the left side.
+  gfx::Rect m_baseBounds;
 };
 
 WritingTextState::WritingTextState(Editor* editor, const gfx::Rect& bounds)
@@ -297,10 +347,10 @@ WritingTextState::WritingTextState(Editor* editor, const gfx::Rect& bounds)
   m_fontChangeConn =
     App::instance()->contextBar()->FontChange.connect(&WritingTextState::onFontChange, this);
 
-  m_entry->NewRequiredBounds.connect([this](const gfx::Size& blobSize) {
-    if (m_bounds.w < blobSize.w || m_bounds.h < blobSize.h) {
-      m_bounds.w = std::max(m_bounds.w, blobSize.w);
-      m_bounds.h = std::max(m_bounds.h, blobSize.h);
+  m_entry->NewRequiredBounds.connect([this](const gfx::RectF& blobBounds) {
+    if (m_bounds.w < blobBounds.w || m_bounds.h < blobBounds.h) {
+      m_bounds.w = std::max(m_bounds.w, blobBounds.w);
+      m_bounds.h = std::max(m_bounds.h, blobBounds.h);
       m_entry->setExtraCelBounds(m_bounds);
       m_entry->setBounds(calcEntryBounds());
     }
@@ -373,11 +423,11 @@ void WritingTextState::onCommitMouseMove(Editor* editor, const gfx::PointF& spri
   if (!m_movingBounds)
     return;
 
-  gfx::Point delta(spritePos - m_cursorStart);
+  gfx::PointF delta(spritePos - m_cursorStart);
   if (delta.x == 0 && delta.y == 0)
     return;
 
-  m_bounds.setOrigin(gfx::Point(delta + m_boundsOrigin));
+  m_bounds.setOrigin(delta + m_boundsOrigin);
   m_entry->setExtraCelBounds(m_bounds);
   m_entry->setBounds(calcEntryBounds());
 }
@@ -393,12 +443,7 @@ bool WritingTextState::onSetCursor(Editor* editor, const gfx::Point& mouseScreen
   return true;
 }
 
-bool WritingTextState::onKeyDown(Editor*, KeyMessage*)
-{
-  return false;
-}
-
-bool WritingTextState::onKeyUp(Editor*, KeyMessage* msg)
+bool WritingTextState::onKeyDown(Editor*, KeyMessage* msg)
 {
   // Cancel loop pressing Esc key
   if (msg->scancode() == ui::kKeyEsc) {
@@ -407,7 +452,17 @@ bool WritingTextState::onKeyUp(Editor*, KeyMessage* msg)
   // Drop text pressing Enter key
   else if (msg->scancode() == ui::kKeyEnter) {
     drop();
+    return true;
   }
+  return false;
+}
+
+bool WritingTextState::onKeyUp(Editor*, KeyMessage* msg)
+{
+  // Note: We cannot process kKeyEnter key here to drop the text as it
+  // could be received after the Enter key is pressed in the IME
+  // dialog to accept the composition (not to accept the text). So we
+  // process kKeyEnter in onKeyDown().
   return true;
 }
 
@@ -460,8 +515,8 @@ EditorState::LeaveAction WritingTextState::onLeaveState(Editor* editor, EditorSt
       // Paints the text in the active layer/sprite creating an
       // undoable transaction.
       Site site = m_editor->getSite();
-      ExtraCelRef extraCel = m_entry->extraCel();
-      Tx tx(site.document(), "Text Tool");
+      ExtraCelRef extraCel = m_entry->extraCel(TextEditor::Final);
+      Tx tx(site.document(), Strings::tools_text());
       ExpandCelCanvas expand(site, site.layer(), TiledMode::NONE, tx, ExpandCelCanvas::None);
 
       expand.validateDestCanvas(gfx::Region(extraCel->cel()->bounds()));
@@ -512,7 +567,7 @@ void WritingTextState::onFontChange(const FontInfo& fontInfo, FontEntry::From fr
 
     // This is useful to show changes to the anti-alias option
     // immediately.
-    auto dummy = m_entry->extraCel();
+    auto dummy = m_entry->extraCel(TextEditor::Intermediate);
 
     if (fromField == FontEntry::From::Popup) {
       if (m_entry)

src/app/ui/editor/writing_text_state.h

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (c) 2022-2024  Igara Studio S.A.
+// Copyright (c) 2022-2025  Igara Studio S.A.
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -59,7 +59,7 @@ private:
 
   DelayedMouseMove m_delayedMouseMove;
   Editor* m_editor;
-  gfx::Rect m_bounds;
+  gfx::RectF m_bounds;
   std::unique_ptr<TextEditor> m_entry;
 
   // True if the text was discarded.
@@ -71,7 +71,7 @@ private:
   bool m_mouseMoveReceived = false;
   bool m_movingBounds = false;
   gfx::PointF m_cursorStart;
-  gfx::Point m_boundsOrigin;
+  gfx::PointF m_boundsOrigin;
 
   obs::scoped_connection m_beforeCmdConn;
   obs::scoped_connection m_fontChangeConn;

src/app/ui/file_list.cpp

@@ -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
@@ -18,6 +18,7 @@
 #include "base/time.h"
 #include "os/surface.h"
 #include "text/font.h"
+#include "text/font_metrics.h"
 #include "ui/ui.h"
 
 #include <algorithm>
@@ -44,6 +45,7 @@ FileList::FileList()
   , m_multiselect(false)
   , m_zoom(1.0)
   , m_itemsPerRow(0)
+  , m_showHidden(Preferences::instance().fileSelector.showHidden())
 {
   setFocusStop(true);
   setDoubleBuffered(true);
@@ -172,6 +174,14 @@ void FileList::animateToZoom(const double zoom)
   startAnimation(ANI_ZOOM, 10);
 }
 
+void FileList::setShowHidden(const bool show)
+{
+  m_showHidden = show;
+  m_req_valid = false;
+  m_selected = nullptr;
+  regenerateList();
+}
+
 bool FileList::onProcessMessage(Message* msg)
 {
   switch (msg->type()) {
@@ -401,7 +411,6 @@ void FileList::onPaint(ui::PaintEvent& ev)
   gfx::Rect bounds = clientBounds();
 
   g->fillRect(theme->colors.background(), bounds);
-  // g->fillRect(bgcolor, gfx::Rect(bounds.x, y, bounds.w, itemSize.h));
 
   int i = 0, selectedIndex = -1;
   for (IFileItem* fi : m_list) {
@@ -506,17 +515,28 @@ void FileList::paintItem(ui::Graphics* g, IFileItem* fi, const int i)
 
   // item name
   if (isIconView() && textBounds.w > info.bounds.w) {
-    g->drawAlignedUIText(fi->displayName().c_str(),
+    g->drawAlignedUIText(fi->displayName(),
                          fgcolor,
                          bgcolor,
                          (textBounds & gfx::Rect(info.bounds).shrink(2 * guiscale())),
                          ui::CENTER | ui::TOP | ui::CHARWRAP);
   }
   else {
-    g->drawText(fi->displayName().c_str(),
-                fgcolor,
-                bgcolor,
-                gfx::Point(textBounds.x + 2 * guiscale(), textBounds.y + 2 * guiscale()));
+    auto blob = text::TextBlob::MakeWithShaper(theme->fontMgr(), font(), fi->displayName());
+    if (blob) {
+      Paint paint;
+      paint.color(fgcolor);
+      paint.style(os::Paint::Fill);
+
+      text::FontMetrics metrics;
+      font()->metrics(&metrics);
+      const float baselineDelta = -metrics.ascent - blob->baseline();
+
+      g->drawTextBlob(
+        blob,
+        gfx::PointF(textBounds.x + 2 * guiscale(), textBounds.y + 2 * guiscale() + baselineDelta),
+        paint);
+    }
   }
 
   // Draw thumbnail progress bar
@@ -814,7 +834,7 @@ void FileList::regenerateList()
     for (FileItemList::iterator it = m_list.begin(); it != m_list.end();) {
       IFileItem* fileitem = *it;
 
-      if (fileitem->isHidden())
+      if (fileitem->isHidden() && !m_showHidden)
         it = m_list.erase(it);
       else if (!fileitem->isFolder() && !fileitem->hasExtension(m_exts)) {
         it = m_list.erase(it);

src/app/ui/file_list.h

@@ -54,6 +54,7 @@ public:
   double zoom() const { return m_zoom; }
   void setZoom(const double zoom);
   void animateToZoom(const double zoom);
+  void setShowHidden(const bool show);
 
   obs::signal<void()> FileSelected;
   obs::signal<void()> FileAccepted;
@@ -137,6 +138,7 @@ private:
   double m_toZoom;
 
   int m_itemsPerRow;
+  bool m_showHidden;
 };
 
 } // namespace app

src/app/ui/file_selector.cpp

@@ -316,6 +316,7 @@ FileSelector::FileSelector(FileSelectorType type) : m_type(type), m_navigationLo
   for (auto child : viewType()->children())
     child->setFocusStop(false);
 
+  showHiddenCheck()->setSelected(Preferences::instance().fileSelector.showHidden());
   m_fileList = new FileList();
   m_fileList->setId("fileview");
   m_fileName->setAssociatedFileList(m_fileList);
@@ -334,6 +335,10 @@ FileSelector::FileSelector(FileSelectorType type) : m_type(type), m_navigationLo
   viewType()->ItemChange.connect([this] { onChangeViewType(); });
   location()->CloseListBox.connect([this] { onLocationCloseListBox(); });
   fileType()->Change.connect([this] { onFileTypeChange(); });
+  showHiddenCheck()->Click.connect([this] {
+    Preferences::instance().fileSelector.showHidden(showHiddenCheck()->isSelected());
+    m_fileList->setShowHidden(showHiddenCheck()->isSelected());
+  });
   m_fileList->FileSelected.connect([this] { onFileListFileSelected(); });
   m_fileList->FileAccepted.connect([this] { onFileListFileAccepted(); });
   m_fileList->CurrentFolderChanged.connect([this] { onFileListCurrentFolderChanged(); });

src/app/ui/filename_field.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019-2022  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -10,8 +10,10 @@
 
 #include "app/ui/filename_field.h"
 
+#include "app/app.h"
 #include "app/i18n/strings.h"
 #include "app/pref/preferences.h"
+#include "app/recent_files.h"
 #include "app/ui/skin/skin_theme.h"
 #include "base/fs.h"
 #include "ui/box.h"
@@ -24,6 +26,11 @@ namespace app {
 
 using namespace ui;
 
+FilenameField::FilenameButton::FilenameButton(const std::string& text) : ButtonSet(1)
+{
+  addItem(text);
+}
+
 FilenameField::FilenameField(const Type type, const std::string& pathAndFilename)
   : m_entry(type == EntryAndButton ? new ui::Entry(1024, "") : nullptr)
   , m_button(type == EntryAndButton ? Strings::select_file_browse() : Strings::select_file_text())
@@ -46,7 +53,10 @@ FilenameField::FilenameField(const Type type, const std::string& pathAndFilename
   if (m_entry)
     m_entry->Change.connect([this] { setFilename(updatedFilename()); });
 
-  m_button.Click.connect([this] { onBrowse(); });
+  m_button.ItemChange.connect([this](ButtonSet::Item* item) {
+    m_button.setSelectedItem(nullptr);
+    onBrowse();
+  });
   initTheme();
 
   m_editFullPathChangeConn = Preferences::instance().general.editFullPath.AfterChange.connect(
@@ -94,7 +104,6 @@ void FilenameField::onSetEditFullPath()
 void FilenameField::onBrowse()
 {
   const gfx::Rect bounds = m_button.bounds();
-  m_button.setSelected(false);
 
   ui::Menu menu;
   ui::MenuItem choose(Strings::select_file_choose());
@@ -107,6 +116,11 @@ void FilenameField::onBrowse()
   menu.addChild(&relative);
   menu.addChild(&absolute);
 
+  if (auto* recent = App::instance()->recentFiles()) {
+    addFoldersToMenu(&menu, recent->pinnedFolders(), Strings::file_selector_pinned_folders());
+    addFoldersToMenu(&menu, recent->recentFolders(), Strings::file_selector_recent_folders());
+  }
+
   choose.Click.connect([this] {
     std::string fn = SelectOutputFile();
     if (!fn.empty()) {
@@ -120,6 +134,21 @@ void FilenameField::onBrowse()
   menu.showPopup(gfx::Point(bounds.x, bounds.y2()), display());
 }
 
+void FilenameField::addFoldersToMenu(ui::Menu* menu,
+                                     const base::paths& folders,
+                                     const std::string& separatorTitle)
+{
+  if (folders.empty())
+    return;
+
+  menu->addChild(new ui::Separator(separatorTitle, ui::HORIZONTAL));
+  for (const std::string& folder : folders) {
+    MenuItem* folderItem = new MenuItem(folder);
+    folderItem->Click.connect([this, folder] { setFilename(base::join_path(folder, m_file)); });
+    menu->addChild(folderItem);
+  }
+}
+
 void FilenameField::setFilename(const std::string& pathAndFilename)
 {
   const std::string spritePath = base::get_file_path(m_docFilename);
@@ -164,11 +193,6 @@ void FilenameField::onInitTheme(ui::InitThemeEvent& ev)
 {
   HBox::onInitTheme(ev);
   setChildSpacing(0);
-
-  auto theme = skin::SkinTheme::get(this);
-  ui::Style* style = theme->styles.miniButton();
-  if (style)
-    m_button.setStyle(style);
 }
 
 void FilenameField::onUpdateText()
@@ -181,9 +205,9 @@ void FilenameField::updateWidgets()
   if (m_entry)
     m_entry->setText(displayedFilename());
   else if (m_file.empty())
-    m_button.setText(Strings::select_file_text());
+    m_button.getItem(0)->setText(Strings::select_file_text());
   else
-    m_button.setText(displayedFilename());
+    m_button.getItem(0)->setText(displayedFilename());
 
   Change();
 }

src/app/ui/filename_field.h

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -8,14 +8,19 @@
 #define APP_UI_FILENAME_FIELD_H_INCLUDED
 #pragma once
 
+#include "app/ui/button_set.h"
+#include "base/paths.h"
 #include "obs/connection.h"
 #include "obs/signal.h"
 #include "ui/box.h"
-#include "ui/button.h"
 #include "ui/entry.h"
 
 #include <string>
 
+namespace ui {
+class Menu;
+}
+
 namespace app {
 
 class FilenameField : public ui::HBox {
@@ -44,17 +49,25 @@ protected:
   void onSetEditFullPath();
 
 private:
+  class FilenameButton : public ButtonSet {
+  public:
+    FilenameButton(const std::string& text);
+  };
+
   void setEditFullPath(const bool on);
   void updateWidgets();
   void onBrowse();
   std::string updatedFilename() const;
+  void addFoldersToMenu(ui::Menu* menu,
+                        const base::paths& folders,
+                        const std::string& separatorTitle);
 
   std::string m_path;
   std::string m_pathBase;
   std::string m_file;
   std::string m_docFilename;
   ui::Entry* m_entry;
-  ui::Button m_button;
+  FilenameButton m_button;
   bool m_editFullPath;
   bool m_askOverwrite;
 

src/app/ui/font_entry.cpp

@@ -12,15 +12,19 @@
 
 #include "app/app.h"
 #include "app/console.h"
+#include "app/i18n/strings.h"
 #include "app/recent_files.h"
 #include "app/ui/font_popup.h"
 #include "app/ui/skin/skin_theme.h"
 #include "base/contains.h"
+#include "base/convert_to.h"
 #include "base/scoped_value.h"
 #include "fmt/format.h"
+#include "text/font_style_set.h"
 #include "ui/display.h"
 #include "ui/fit_bounds.h"
 #include "ui/manager.h"
+#include "ui/menu.h"
 #include "ui/message.h"
 #include "ui/scale.h"
 
@@ -262,22 +266,91 @@ void FontEntry::FontSize::onEntryChange()
   Change();
 }
 
-FontEntry::FontStyle::FontStyle() : ButtonSet(3, true)
+FontEntry::FontStyle::FontStyle(ui::TooltipManager* tooltips) : ButtonSet(3, true)
 {
   addItem("B");
   addItem("I");
   addItem("...");
   setMultiMode(MultiMode::Set);
+
+  tooltips->addTooltipFor(getItem(0), Strings::font_style_font_weight(), BOTTOM);
+  tooltips->addTooltipFor(getItem(1), Strings::text_tool_italic(), BOTTOM);
+  tooltips->addTooltipFor(getItem(2), Strings::text_tool_more_options(), BOTTOM);
 }
 
-FontEntry::FontEntry()
+FontEntry::FontStroke::FontStroke(ui::TooltipManager* tooltips) : m_fill(2)
+{
+  auto* theme = skin::SkinTheme::get(this);
+
+  m_fill.addItem(theme->parts.toolFilledRectangle(), theme->styles.contextBarButton());
+  m_fill.addItem(theme->parts.toolRectangle(), theme->styles.contextBarButton());
+  m_fill.setSelectedItem(0);
+  m_fill.ItemChange.connect([this] { Change(); });
+
+  m_stroke.setText("0");
+  m_stroke.setSuffix("pt");
+  m_stroke.ValueChange.connect([this] { Change(); });
+
+  addChild(&m_fill);
+  addChild(&m_stroke);
+
+  tooltips->addTooltipFor(m_fill.getItem(0), Strings::shape_fill(), BOTTOM);
+  tooltips->addTooltipFor(m_fill.getItem(1), Strings::shape_stroke(), BOTTOM);
+  tooltips->addTooltipFor(&m_stroke, Strings::shape_stroke_width(), BOTTOM);
+}
+
+bool FontEntry::FontStroke::fill() const
+{
+  return const_cast<FontStroke*>(this)->m_fill.getItem(0)->isSelected();
+}
+
+float FontEntry::FontStroke::stroke() const
+{
+  return m_stroke.textDouble();
+}
+
+FontEntry::FontStroke::WidthEntry::WidthEntry() : ui::IntEntry(0, 100, this)
+{
+}
+
+void FontEntry::FontStroke::WidthEntry::onValueChange()
+{
+  ui::IntEntry::onValueChange();
+  ValueChange();
+}
+
+bool FontEntry::FontStroke::WidthEntry::onAcceptUnicodeChar(int unicodeChar)
+{
+  return (IntEntry::onAcceptUnicodeChar(unicodeChar) || unicodeChar == '.');
+}
+
+std::string FontEntry::FontStroke::WidthEntry::onGetTextFromValue(int value)
+{
+  return fmt::format("{:.1f}", value / 10.0);
+}
+
+int FontEntry::FontStroke::WidthEntry::onGetValueFromText(const std::string& text)
+{
+  return int(10.0 * base::convert_to<double>(text));
+}
+
+FontEntry::FontEntry(const bool withStrokeAndFill)
+  : m_style(&m_tooltips)
+  , m_stroke(withStrokeAndFill ? std::make_unique<FontStroke>(&m_tooltips) : nullptr)
 {
   m_face.setExpansive(true);
   m_size.setExpansive(false);
   m_style.setExpansive(false);
+
+  addChild(&m_tooltips);
   addChild(&m_face);
   addChild(&m_size);
   addChild(&m_style);
+  if (m_stroke)
+    addChild(m_stroke.get());
+
+  m_tooltips.addTooltipFor(&m_face, Strings::text_tool_font_family(), BOTTOM);
+  m_tooltips.addTooltipFor(m_size.getEntryWidget(), Strings::text_tool_font_size(), BOTTOM);
 
   m_face.setMinSize(gfx::Size(128 * guiscale(), 0));
 
@@ -299,6 +372,8 @@ FontEntry::FontEntry()
   });
 
   m_style.ItemChange.connect(&FontEntry::onStyleItemClick, this);
+  if (m_stroke)
+    m_stroke->Change.connect(&FontEntry::onStrokeChange, this);
 }
 
 // Defined here as FontPopup type is not fully defined in the header
@@ -311,22 +386,100 @@ void FontEntry::setInfo(const FontInfo& info, const From fromField)
 {
   m_info = info;
 
-  if (fromField != From::Face)
-    m_face.setText(info.title());
+  auto family = theme()->fontMgr()->matchFamily(m_info.name());
+  bool hasBold = false;
+  m_availableWeights.clear();
+
+  if (family) {
+    auto checkWeight = [this, &family, &hasBold](text::FontStyle::Weight w) {
+      auto ref = family->matchStyle(
+        text::FontStyle(w, m_info.style().width(), m_info.style().slant()));
+      if (ref->fontStyle().weight() == w)
+        m_availableWeights.push_back(w);
+
+      if (ref->fontStyle().weight() == text::FontStyle::Weight::Bold)
+        hasBold = true;
+    };
+
+    checkWeight(text::FontStyle::Weight::Thin);
+    checkWeight(text::FontStyle::Weight::ExtraLight);
+    checkWeight(text::FontStyle::Weight::Light);
+    checkWeight(text::FontStyle::Weight::Normal);
+    checkWeight(text::FontStyle::Weight::Medium);
+    checkWeight(text::FontStyle::Weight::SemiBold);
+    checkWeight(text::FontStyle::Weight::Bold);
+    checkWeight(text::FontStyle::Weight::Black);
+    checkWeight(text::FontStyle::Weight::ExtraBlack);
+  }
+  else {
+    // Stick to only "normal" for fonts without a family.
+    m_availableWeights.push_back(text::FontStyle::Weight::Normal);
+    m_style.getItem(0)->setEnabled(false);
+  }
+
+  if (std::find(m_availableWeights.begin(), m_availableWeights.end(), m_info.style().weight()) ==
+      m_availableWeights.end()) {
+    // The currently selected weight is not available, reset it back to normal.
+    m_info = app::FontInfo(m_info,
+                           m_info.size(),
+                           text::FontStyle(text::FontStyle::Weight::Normal,
+                                           m_info.style().width(),
+                                           m_info.style().slant()),
+                           m_info.flags(),
+                           m_info.hinting());
+  }
+
+  if (fromField != From::Face) {
+    m_face.setText(m_info.title());
+  }
 
   if (fromField != From::Size) {
-    m_size.updateForFont(info);
-    m_size.setValue(fmt::format("{}", info.size()));
+    m_size.updateForFont(m_info);
+    m_size.setValue(fmt::format("{}", m_info.size()));
+  }
+
+  m_style.getItem(0)->setEnabled(hasBold);
+  m_style.getItem(0)->setSelected(m_info.style().weight() != text::FontStyle::Weight::Normal);
+  m_style.getItem(0)->setText("B");
+
+  // Give some indication of what the weight is, if we have any variation
+  if (m_style.getItem(0)->isSelected() && m_availableWeights.size() > 1) {
+    if (m_info.style().weight() > text::FontStyle::Weight::Bold)
+      m_style.getItem(0)->setText("B+");
+    else if (m_info.style().weight() < text::FontStyle::Weight::Bold)
+      m_style.getItem(0)->setText("B-");
   }
 
   if (fromField != From::Style) {
-    m_style.getItem(0)->setSelected(info.style().weight() >= text::FontStyle::Weight::SemiBold);
-    m_style.getItem(1)->setSelected(info.style().slant() != text::FontStyle::Slant::Upright);
+    m_style.getItem(1)->setSelected(m_info.style().slant() != text::FontStyle::Slant::Upright);
   }
 
   FontChange(m_info, fromField);
 }
 
+ui::Paint FontEntry::paint()
+{
+  ui::Paint paint;
+  ui::Paint::Style style = ui::Paint::Fill;
+
+  if (m_stroke) {
+    const float stroke = m_stroke->stroke();
+    if (m_stroke->fill()) {
+      if (stroke > 0.0f) {
+        style = ui::Paint::StrokeAndFill;
+        paint.strokeWidth(stroke);
+      }
+    }
+    else {
+      style = ui::Paint::Stroke;
+      paint.strokeWidth(stroke);
+    }
+  }
+
+  paint.style(style);
+  return paint;
+}
+
 void FontEntry::onStyleItemClick(ButtonSet::Item* item)
 {
   text::FontStyle style = m_info.style();
@@ -334,17 +487,51 @@ void FontEntry::onStyleItemClick(ButtonSet::Item* item)
   switch (m_style.getItemIndex(item)) {
     // Bold button changed
     case 0: {
-      const bool bold = m_style.getItem(0)->isSelected();
-      style = text::FontStyle(
-        bold ? text::FontStyle::Weight::Bold : text::FontStyle::Weight::Normal,
-        style.width(),
-        style.slant());
+      if (m_availableWeights.size() > 2) {
+        // Ensure consistency, since the click also affects the "selected" highlighting.
+        item->setSelected(style.weight() != text::FontStyle::Weight::Normal);
 
-      setInfo(FontInfo(m_info, m_info.size(), style, m_info.flags(), m_info.hinting()),
-              From::Style);
+        Menu weightMenu;
+        auto currentWeight = m_info.style().weight();
+
+        auto weightChange = [this](text::FontStyle::Weight newWeight) {
+          const text::FontStyle style(newWeight, m_info.style().width(), m_info.style().slant());
+          setInfo(FontInfo(m_info, m_info.size(), style, m_info.flags(), m_info.hinting()),
+                  From::Style);
+        };
+
+        for (auto weight : m_availableWeights) {
+          auto* menuItem = new MenuItem(Strings::Translate(
+            fmt::format("font_style.font_weight_{}", static_cast<int>(weight)).c_str()));
+          menuItem->setSelected(weight == currentWeight);
+          if (!menuItem->isSelected())
+            menuItem->Click.connect([&weightChange, weight] { weightChange(weight); });
+
+          if (weight == text::FontStyle::Weight::Bold &&
+              currentWeight == text::FontStyle::Weight::Normal)
+            menuItem->setHighlighted(true);
+
+          weightMenu.addChild(menuItem);
+        }
+
+        weightMenu.initTheme();
+        const auto& bounds = m_style.getItem(0)->bounds();
+
+        weightMenu.showPopup(gfx::Point(bounds.x, bounds.y2()), display());
+      }
+      else {
+        const bool isBold = m_info.style().weight() == text::FontStyle::Weight::Bold;
+        style = text::FontStyle(
+          isBold ? text::FontStyle::Weight::Normal : text::FontStyle::Weight::Bold,
+          style.width(),
+          style.slant());
+
+        setInfo(FontInfo(m_info, m_info.size(), style, m_info.flags(), m_info.hinting()),
+                From::Style);
+      }
       break;
     }
-      // Italic button changed
+    // Italic button changed
     case 1: {
       const bool italic = m_style.getItem(1)->isSelected();
       style = text::FontStyle(
@@ -404,4 +591,9 @@ void FontEntry::onStyleItemClick(ButtonSet::Item* item)
   }
 }
 
+void FontEntry::onStrokeChange()
+{
+  FontChange(m_info, From::Paint);
+}
+
 } // namespace app

src/app/ui/font_entry.h

@@ -14,7 +14,11 @@
 #include "ui/box.h"
 #include "ui/button.h"
 #include "ui/combobox.h"
+#include "ui/int_entry.h"
+#include "ui/paint.h"
+#include "ui/tooltips.h"
 
+#include <memory>
 #include <string>
 
 namespace app {
@@ -30,18 +34,22 @@ public:
     Flags,
     Hinting,
     Popup,
+    Paint,
   };
 
-  FontEntry();
+  FontEntry(bool withStrokeAndFill);
   ~FontEntry();
 
   FontInfo info() { return m_info; }
   void setInfo(const FontInfo& info, From from);
 
+  ui::Paint paint();
+
   obs::signal<void(const FontInfo&, From)> FontChange;
 
 private:
   void onStyleItemClick(ButtonSet::Item* item);
+  void onStrokeChange();
 
   class FontFace : public SearchEntry {
   public:
@@ -73,13 +81,41 @@ private:
 
   class FontStyle : public ButtonSet {
   public:
-    FontStyle();
+    FontStyle(ui::TooltipManager* tooltips);
   };
 
+  class FontStroke : public HBox {
+  public:
+    FontStroke(ui::TooltipManager* tooltips);
+    bool fill() const;
+    float stroke() const;
+    obs::signal<void()> Change;
+
+  private:
+    class WidthEntry : public ui::IntEntry,
+                       public ui::SliderDelegate {
+    public:
+      WidthEntry();
+      obs::signal<void()> ValueChange;
+
+    private:
+      void onValueChange() override;
+      bool onAcceptUnicodeChar(int unicodeChar) override;
+      // SliderDelegate impl
+      std::string onGetTextFromValue(int value) override;
+      int onGetValueFromText(const std::string& text) override;
+    };
+    ButtonSet m_fill;
+    WidthEntry m_stroke;
+  };
+
+  ui::TooltipManager m_tooltips;
   FontInfo m_info;
   FontFace m_face;
   FontSize m_size;
   FontStyle m_style;
+  std::unique_ptr<FontStroke> m_stroke;
+  std::vector<text::FontStyle::Weight> m_availableWeights;
   bool m_lockFace = false;
 };
 

src/app/ui/font_popup.cpp

@@ -194,7 +194,11 @@ private:
       if (!blob)
         return;
 
-      doc::ImageRef image = render_text_blob(blob, gfx::rgba(0, 0, 0));
+      ui::Paint paint;
+      paint.color(gfx::rgba(0, 0, 0));
+      paint.style(ui::Paint::Fill);
+      const gfx::RectF textBounds = get_text_blob_required_bounds(blob);
+      doc::ImageRef image = render_text_blob(blob, textBounds, paint);
       if (!image)
         return;
 

src/app/ui/key.cpp

@@ -0,0 +1,647 @@
+// Aseprite
+// Copyright (C) 2018-2025  Igara Studio S.A.
+// Copyright (C) 2001-2018  David Capello
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#ifdef HAVE_CONFIG_H
+  #include "config.h"
+#endif
+
+#include "app/ui/key.h"
+
+#include "app/commands/command.h"
+#include "app/i18n/strings.h"
+#include "app/tools/tool.h"
+#include "app/ui/keyboard_shortcuts.h"
+#include "ui/message.h"
+#include "ui/shortcut.h"
+
+#include <string>
+#include <vector>
+
+#define I18N_KEY(a) app::Strings::keyboard_shortcuts_##a()
+
+namespace {
+
+struct KeyShortcutAction {
+  const char* name;
+  std::string userfriendly;
+  app::KeyAction action;
+  app::KeyContext context;
+};
+
+std::vector<KeyShortcutAction> g_actions;
+
+const std::vector<KeyShortcutAction>& actions()
+{
+  if (g_actions.empty()) {
+    g_actions = std::vector<KeyShortcutAction>{
+      { "CopySelection",
+       I18N_KEY(copy_selection),
+       app::KeyAction::CopySelection,
+       app::KeyContext::TranslatingSelection },
+      { "SnapToGrid",
+       I18N_KEY(snap_to_grid),
+       app::KeyAction::SnapToGrid,
+       app::KeyContext::TranslatingSelection },
+      { "LockAxis",
+       I18N_KEY(lock_axis),
+       app::KeyAction::LockAxis,
+       app::KeyContext::TranslatingSelection },
+      { "FineControl",
+       I18N_KEY(fine_translating),
+       app::KeyAction::FineControl,
+       app::KeyContext::TranslatingSelection },
+      { "MaintainAspectRatio",
+       I18N_KEY(maintain_aspect_ratio),
+       app::KeyAction::MaintainAspectRatio,
+       app::KeyContext::ScalingSelection     },
+      { "ScaleFromCenter",
+       I18N_KEY(scale_from_center),
+       app::KeyAction::ScaleFromCenter,
+       app::KeyContext::ScalingSelection     },
+      { "FineControl",
+       I18N_KEY(fine_scaling),
+       app::KeyAction::FineControl,
+       app::KeyContext::ScalingSelection     },
+      { "AngleSnap",
+       I18N_KEY(angle_snap),
+       app::KeyAction::AngleSnap,
+       app::KeyContext::RotatingSelection    },
+      { "AddSelection",
+       I18N_KEY(add_selection),
+       app::KeyAction::AddSelection,
+       app::KeyContext::SelectionTool        },
+      { "SubtractSelection",
+       I18N_KEY(subtract_selection),
+       app::KeyAction::SubtractSelection,
+       app::KeyContext::SelectionTool        },
+      { "IntersectSelection",
+       I18N_KEY(intersect_selection),
+       app::KeyAction::IntersectSelection,
+       app::KeyContext::SelectionTool        },
+      { "AutoSelectLayer",
+       I18N_KEY(auto_select_layer),
+       app::KeyAction::AutoSelectLayer,
+       app::KeyContext::MoveTool             },
+      { "StraightLineFromLastPoint",
+       I18N_KEY(line_from_last_point),
+       app::KeyAction::StraightLineFromLastPoint,
+       app::KeyContext::FreehandTool         },
+      { "AngleSnapFromLastPoint",
+       I18N_KEY(angle_from_last_point),
+       app::KeyAction::AngleSnapFromLastPoint,
+       app::KeyContext::FreehandTool         },
+      { "MoveOrigin",
+       I18N_KEY(move_origin),
+       app::KeyAction::MoveOrigin,
+       app::KeyContext::ShapeTool            },
+      { "SquareAspect",
+       I18N_KEY(square_aspect),
+       app::KeyAction::SquareAspect,
+       app::KeyContext::ShapeTool            },
+      { "DrawFromCenter",
+       I18N_KEY(draw_from_center),
+       app::KeyAction::DrawFromCenter,
+       app::KeyContext::ShapeTool            },
+      { "RotateShape",
+       I18N_KEY(rotate_shape),
+       app::KeyAction::RotateShape,
+       app::KeyContext::ShapeTool            },
+      { "LeftMouseButton",
+       I18N_KEY(trigger_left_mouse_button),
+       app::KeyAction::LeftMouseButton,
+       app::KeyContext::Any                  },
+      { "RightMouseButton",
+       I18N_KEY(trigger_right_mouse_button),
+       app::KeyAction::RightMouseButton,
+       app::KeyContext::Any                  }
+    };
+  }
+  return g_actions;
+}
+
+struct {
+  const char* name;
+  app::KeyContext context;
+} g_contexts[] = {
+  { "",                     app::KeyContext::Any                  },
+  { "Normal",               app::KeyContext::Normal               },
+  { "Selection",            app::KeyContext::SelectionTool        },
+  { "TranslatingSelection", app::KeyContext::TranslatingSelection },
+  { "ScalingSelection",     app::KeyContext::ScalingSelection     },
+  { "RotatingSelection",    app::KeyContext::RotatingSelection    },
+  { "MoveTool",             app::KeyContext::MoveTool             },
+  { "FreehandTool",         app::KeyContext::FreehandTool         },
+  { "ShapeTool",            app::KeyContext::ShapeTool            },
+  { "FramesSelection",      app::KeyContext::FramesSelection      },
+  { "Transformation",       app::KeyContext::Transformation       },
+  { NULL,                   app::KeyContext::Any                  }
+};
+
+using Vec = app::DragVector;
+
+struct KeyShortcutWheelAction {
+  const char* name;
+  const std::string userfriendly;
+  Vec vector;
+};
+
+std::vector<KeyShortcutWheelAction> g_wheel_actions;
+
+const std::vector<KeyShortcutWheelAction>& wheel_actions()
+{
+  if (g_wheel_actions.empty()) {
+    g_wheel_actions = std::vector<KeyShortcutWheelAction>{
+      { "",               "",                               Vec(0.0,  0.0)   },
+      { "Zoom",           I18N_KEY(zoom),                   Vec(8.0,  0.0)   },
+      { "VScroll",        I18N_KEY(scroll_vertically),      Vec(4.0,  0.0)   },
+      { "HScroll",        I18N_KEY(scroll_horizontally),    Vec(4.0,  0.0)   },
+      { "FgColor",        I18N_KEY(fg_color),               Vec(8.0,  0.0)   },
+      { "BgColor",        I18N_KEY(bg_color),               Vec(8.0,  0.0)   },
+      { "FgTile",         I18N_KEY(fg_tile),                Vec(8.0,  0.0)   },
+      { "BgTile",         I18N_KEY(bg_tile),                Vec(8.0,  0.0)   },
+      { "Frame",          I18N_KEY(change_frame),           Vec(16.0, 0.0)   },
+      { "BrushSize",      I18N_KEY(change_brush_size),      Vec(4.0,  0.0)   },
+      { "BrushAngle",     I18N_KEY(change_brush_angle),     Vec(-4.0, 0.0)   },
+      { "ToolSameGroup",  I18N_KEY(change_tool_same_group), Vec(8.0,  0.0)   },
+      { "ToolOtherGroup", I18N_KEY(change_tool),            Vec(0.0,  -8.0)  },
+      { "Layer",          I18N_KEY(change_layer),           Vec(0.0,  8.0)   },
+      { "InkType",        I18N_KEY(change_ink_type),        Vec(0.0,  -16.0) },
+      { "InkOpacity",     I18N_KEY(change_ink_opacity),     Vec(0.0,  1.0)   },
+      { "LayerOpacity",   I18N_KEY(change_layer_opacity),   Vec(0.0,  1.0)   },
+      { "CelOpacity",     I18N_KEY(change_cel_opacity),     Vec(0.0,  1.0)   },
+      { "Alpha",          I18N_KEY(color_alpha),            Vec(4.0,  0.0)   },
+      { "HslHue",         I18N_KEY(color_hsl_hue),          Vec(1.0,  0.0)   },
+      { "HslSaturation",  I18N_KEY(color_hsl_saturation),   Vec(4.0,  0.0)   },
+      { "HslLightness",   I18N_KEY(color_hsl_lightness),    Vec(0.0,  4.0)   },
+      { "HsvHue",         I18N_KEY(color_hsv_hue),          Vec(1.0,  0.0)   },
+      { "HsvSaturation",  I18N_KEY(color_hsv_saturation),   Vec(4.0,  0.0)   },
+      { "HsvValue",       I18N_KEY(color_hsv_value),        Vec(0.0,  4.0)   }
+    };
+  }
+  return g_wheel_actions;
+}
+
+std::string get_user_friendly_string_for_keyaction(app::KeyAction action, app::KeyContext context)
+{
+  for (const auto& a : actions()) {
+    if (action == a.action && context == a.context)
+      return a.userfriendly;
+  }
+  return {};
+}
+
+std::string get_user_friendly_string_for_wheelaction(app::WheelAction wheelAction)
+{
+  const int c = int(wheelAction);
+  if (c >= int(app::WheelAction::First) && c <= int(app::WheelAction::Last))
+    return wheel_actions()[c].userfriendly;
+  return {};
+}
+
+void erase_shortcut(app::AppShortcuts& kvs,
+                    const app::KeySource source,
+                    const ui::Shortcut& shortcut)
+{
+  for (auto it = kvs.begin(); it != kvs.end();) {
+    auto& kv = *it;
+    if (kv.source() == source && kv.shortcut() == shortcut)
+      it = kvs.erase(it);
+    else
+      ++it;
+  }
+}
+
+void erase_shortcuts(app::AppShortcuts& kvs, const app::KeySource source)
+{
+  for (auto it = kvs.begin(); it != kvs.end();) {
+    auto& kv = *it;
+    if (kv.source() == source)
+      it = kvs.erase(it);
+    else
+      ++it;
+  }
+}
+
+} // anonymous namespace
+
+namespace base {
+
+template<>
+app::KeyAction convert_to(const std::string& from)
+{
+  for (const auto& a : actions()) {
+    if (from == a.name)
+      return a.action;
+  }
+  return app::KeyAction::None;
+}
+
+template<>
+std::string convert_to(const app::KeyAction& from)
+{
+  for (const auto& a : actions()) {
+    if (from == a.action)
+      return a.name;
+  }
+  return {};
+}
+
+template<>
+app::WheelAction convert_to(const std::string& from)
+{
+  for (int c = int(app::WheelAction::First); c <= int(app::WheelAction::Last); ++c) {
+    if (from == wheel_actions()[c].name)
+      return (app::WheelAction)c;
+  }
+  return app::WheelAction::None;
+}
+
+template<>
+std::string convert_to(const app::WheelAction& from)
+{
+  const int c = int(from);
+  if (c >= int(app::WheelAction::First) && c <= int(app::WheelAction::Last))
+    return wheel_actions()[c].name;
+  return {};
+}
+
+template<>
+app::KeyContext convert_to(const std::string& from)
+{
+  for (int c = 0; g_contexts[c].name; ++c) {
+    if (from == g_contexts[c].name)
+      return g_contexts[c].context;
+  }
+  return app::KeyContext::Any;
+}
+
+template<>
+std::string convert_to(const app::KeyContext& from)
+{
+  for (int c = 0; g_contexts[c].name; ++c) {
+    if (from == g_contexts[c].context)
+      return g_contexts[c].name;
+  }
+  return {};
+}
+
+} // namespace base
+
+namespace app {
+
+using namespace ui;
+
+bool AppShortcut::fitsBetterThan(const KeyContext currentContext,
+                                 const KeyContext thisShortcutContext,
+                                 const KeyContext otherShortcutContext,
+                                 const AppShortcut& otherShortcut) const
+{
+  // Better context in the same source
+  if (otherShortcut.source() == this->source() && otherShortcutContext != currentContext &&
+      thisShortcutContext == currentContext)
+    return true;
+
+  // Better key source/level: User-defined > Extension-defined > App-defined
+  if (int(source()) > int(otherShortcut.source()) && (thisShortcutContext == currentContext ||
+                                                      // User-defined "Any" context overwrites all
+                                                      // app-defined context
+                                                      thisShortcutContext == KeyContext::Any))
+    return true;
+
+  // Normal > SelectionTool > Transformation
+  if ((currentContext == KeyContext::Transformation &&
+       otherShortcutContext != KeyContext::Transformation &&
+       thisShortcutContext == KeyContext::SelectionTool))
+    return true;
+
+  return false;
+}
+
+Key::Key(const Key& k)
+  : m_type(k.m_type)
+  , m_adds(k.m_adds)
+  , m_dels(k.m_dels)
+  , m_keycontext(k.m_keycontext)
+{
+  switch (m_type) {
+    case KeyType::Command:
+      m_command = k.m_command;
+      m_params = k.m_params;
+      break;
+    case KeyType::Tool:
+    case KeyType::Quicktool: m_tool = k.m_tool; break;
+    case KeyType::Action:    m_action = k.m_action; break;
+    case KeyType::WheelAction:
+      m_action = k.m_action;
+      m_wheelAction = k.m_wheelAction;
+      break;
+    case KeyType::DragAction:
+      m_action = k.m_action;
+      m_wheelAction = k.m_wheelAction;
+      m_dragVector = k.m_dragVector;
+      break;
+  }
+}
+
+Key::Key(Command* command, const Params& params, const KeyContext keyContext)
+  : m_type(KeyType::Command)
+  , m_keycontext(keyContext)
+  , m_command(command)
+  , m_params(params)
+{
+}
+
+Key::Key(const KeyType type, tools::Tool* tool)
+  : m_type(type)
+  , m_keycontext(KeyContext::Any)
+  , m_tool(tool)
+{
+}
+
+Key::Key(const KeyAction action, const KeyContext keyContext)
+  : m_type(KeyType::Action)
+  , m_keycontext(keyContext)
+  , m_action(action)
+{
+  if (m_keycontext != KeyContext::Any)
+    return;
+
+  // Automatic key context
+  switch (action) {
+    case KeyAction::None:                      m_keycontext = KeyContext::Any; break;
+    case KeyAction::CopySelection:
+    case KeyAction::SnapToGrid:
+    case KeyAction::LockAxis:
+    case KeyAction::FineControl:               m_keycontext = KeyContext::TranslatingSelection; break;
+    case KeyAction::AngleSnap:                 m_keycontext = KeyContext::RotatingSelection; break;
+    case KeyAction::MaintainAspectRatio:
+    case KeyAction::ScaleFromCenter:           m_keycontext = KeyContext::ScalingSelection; break;
+    case KeyAction::AddSelection:
+    case KeyAction::SubtractSelection:
+    case KeyAction::IntersectSelection:        m_keycontext = KeyContext::SelectionTool; break;
+    case KeyAction::AutoSelectLayer:           m_keycontext = KeyContext::MoveTool; break;
+    case KeyAction::StraightLineFromLastPoint:
+    case KeyAction::AngleSnapFromLastPoint:    m_keycontext = KeyContext::FreehandTool; break;
+    case KeyAction::MoveOrigin:
+    case KeyAction::SquareAspect:
+    case KeyAction::DrawFromCenter:
+    case KeyAction::RotateShape:               m_keycontext = KeyContext::ShapeTool; break;
+    case KeyAction::LeftMouseButton:
+    case KeyAction::RightMouseButton:          m_keycontext = KeyContext::Any; break;
+  }
+}
+
+Key::Key(const WheelAction wheelAction)
+  : m_type(KeyType::WheelAction)
+  , m_keycontext(KeyContext::MouseWheel)
+  , m_action(KeyAction::None)
+  , m_wheelAction(wheelAction)
+{
+}
+
+// static
+KeyPtr Key::MakeDragAction(WheelAction dragAction)
+{
+  KeyPtr k(new Key(dragAction));
+  k->m_type = KeyType::DragAction;
+  k->m_keycontext = KeyContext::Any;
+  k->m_dragVector = wheel_actions()[(int)dragAction].vector;
+  return k;
+}
+
+const AppShortcuts& Key::shortcuts() const
+{
+  if (!m_shortcuts) {
+    m_shortcuts = std::make_unique<AppShortcuts>();
+
+    // Add default keys
+    for (const auto& kv : m_adds) {
+      if (kv.source() == KeySource::Original)
+        m_shortcuts->add(kv);
+    }
+
+    // Delete/add extension-defined keys
+    for (const auto& kv : m_dels) {
+      if (kv.source() == KeySource::ExtensionDefined)
+        m_shortcuts->remove(kv);
+      else {
+        ASSERT(kv.source() != KeySource::Original);
+      }
+    }
+    for (const auto& kv : m_adds) {
+      if (kv.source() == KeySource::ExtensionDefined)
+        m_shortcuts->add(kv);
+    }
+
+    // Delete/add user-defined keys
+    for (const auto& kv : m_dels) {
+      if (kv.source() == KeySource::UserDefined)
+        m_shortcuts->remove(kv);
+    }
+    for (const auto& kv : m_adds) {
+      if (kv.source() == KeySource::UserDefined)
+        m_shortcuts->add(kv);
+    }
+  }
+  return *m_shortcuts;
+}
+
+void Key::add(const ui::Shortcut& shortcut, const KeySource source, KeyboardShortcuts& globalKeys)
+{
+  m_adds.push_back(AppShortcut(source, shortcut));
+  m_shortcuts.reset();
+
+  // Remove the shortcut from other commands
+  if (source == KeySource::ExtensionDefined || source == KeySource::UserDefined) {
+    erase_shortcut(m_dels, source, shortcut);
+
+    globalKeys.disableShortcut(shortcut, source, m_keycontext, this);
+  }
+}
+
+bool Key::fitsContext(const KeyContext keyContext) const
+{
+  // This key is for any context
+  if (m_keycontext == KeyContext::Any)
+    return true;
+
+  // This key is for the same context
+  if (m_keycontext == keyContext)
+    return true;
+
+  // Use Normal or SelectionTool keys in Transformation context
+  if (keyContext == KeyContext::Transformation &&
+      (m_keycontext == KeyContext::SelectionTool || m_keycontext == KeyContext::Normal))
+    return true;
+
+  // Use Normal keys in SelectionTool or FramesSelection contexts
+  if ((keyContext == KeyContext::SelectionTool || keyContext == KeyContext::FramesSelection) &&
+      (m_keycontext == KeyContext::Normal))
+    return true;
+
+  return false;
+}
+
+const AppShortcut* Key::isPressed(const Message* msg, const KeyContext keyContext) const
+{
+  const AppShortcut* best = nullptr;
+
+  if (const auto* keyMsg = dynamic_cast<const KeyMessage*>(msg)) {
+    if (fitsContext(keyContext)) {
+      for (const AppShortcut& shortcut : shortcuts()) {
+        if (shortcut.isPressed(keyMsg->modifiers(), keyMsg->scancode(), keyMsg->unicodeChar()) &&
+            (!best || shortcut.fitsBetterThan(keyContext, keycontext(), keycontext(), *best))) {
+          best = &shortcut;
+        }
+      }
+    }
+  }
+  else if (const auto* mouseMsg = dynamic_cast<const MouseMessage*>(msg)) {
+    if (m_keycontext == KeyContext::Any ||
+        // TODO we could have multiple mouse wheel key-context,
+        // like "sprite editor" context, or "timeline" context,
+        // etc.
+        m_keycontext == KeyContext::MouseWheel) {
+      for (const AppShortcut& shortcut : shortcuts()) {
+        if (shortcut.modifiers() == mouseMsg->modifiers())
+          return &shortcut;
+      }
+    }
+  }
+  return best;
+}
+
+const AppShortcut* Key::isPressed(const Message* msg) const
+{
+  return isPressed(msg, KeyboardShortcuts::getCurrentKeyContext());
+}
+
+bool Key::isPressed() const
+{
+  const auto& ss = this->shortcuts();
+  return std::any_of(ss.begin(), ss.end(), [](const AppShortcut& shortcut) {
+    return shortcut.isPressed();
+  });
+}
+
+bool Key::isLooselyPressed() const
+{
+  const auto& ss = this->shortcuts();
+  return std::any_of(ss.begin(), ss.end(), [](const AppShortcut& shortcut) {
+    return shortcut.isLooselyPressed();
+  });
+}
+
+bool Key::isCommandListed() const
+{
+  return type() == KeyType::Command && command()->isListed(params());
+}
+
+bool Key::hasShortcut(const ui::Shortcut& shortcut) const
+{
+  return shortcuts().has(AppShortcut(
+    // KeySource is not used in has()
+    KeySource::Original,
+    shortcut));
+}
+
+bool Key::hasUserDefinedShortcuts() const
+{
+  return std::any_of(m_adds.begin(), m_adds.end(), [](const auto& kv) {
+    return (kv.source() == KeySource::UserDefined);
+  });
+}
+
+void Key::disableShortcut(const ui::Shortcut& shortcut, const KeySource source)
+{
+  // It doesn't make sense that the default keyboard shortcuts file
+  // (gui.xml) removes some shortcut.
+  ASSERT(source != KeySource::Original);
+
+  erase_shortcut(m_adds, source, shortcut);
+  erase_shortcut(m_dels, source, shortcut);
+
+  m_dels.push_back(AppShortcut(source, shortcut));
+  m_shortcuts.reset();
+}
+
+void Key::reset()
+{
+  erase_shortcuts(m_adds, KeySource::UserDefined);
+  erase_shortcuts(m_dels, KeySource::UserDefined);
+  m_shortcuts.reset();
+}
+
+void Key::copyOriginalToUser()
+{
+  // Erase all user-defined keys
+  erase_shortcuts(m_adds, KeySource::UserDefined);
+  erase_shortcuts(m_dels, KeySource::UserDefined);
+
+  // Then copy all original & extension-defined keys as user-defined
+  auto copy = m_adds;
+  for (const auto& kv : copy)
+    m_adds.push_back(AppShortcut(KeySource::UserDefined, kv));
+  m_shortcuts.reset();
+}
+
+std::string Key::triggerString() const
+{
+  switch (m_type) {
+    case KeyType::Command:   m_command->loadParams(m_params); return m_command->friendlyName();
+    case KeyType::Tool:
+    case KeyType::Quicktool: {
+      std::string text = m_tool->getText();
+      if (m_type == KeyType::Quicktool)
+        text += " (quick)";
+      return text;
+    }
+    case KeyType::Action:      return get_user_friendly_string_for_keyaction(m_action, m_keycontext);
+    case KeyType::WheelAction:
+    case KeyType::DragAction:  return get_user_friendly_string_for_wheelaction(m_wheelAction);
+  }
+  return "Unknown";
+}
+
+void reset_key_tables_that_depends_on_language()
+{
+  g_actions.clear();
+  g_wheel_actions.clear();
+}
+
+std::string key_tooltip(const char* str, const app::Key* key)
+{
+  std::string res;
+  if (str)
+    res += str;
+  if (key && !key->shortcuts().empty()) {
+    res += " (";
+    res += key->shortcuts().front().toString();
+    res += ")";
+  }
+  return res;
+}
+
+std::string convert_keycontext_to_user_friendly_string(const KeyContext keyctx)
+{
+  switch (keyctx) {
+    case KeyContext::Any:                  return {};
+    case KeyContext::Normal:               return I18N_KEY(key_context_normal);
+    case KeyContext::SelectionTool:        return I18N_KEY(key_context_selection);
+    case KeyContext::TranslatingSelection: return I18N_KEY(key_context_translating_selection);
+    case KeyContext::ScalingSelection:     return I18N_KEY(key_context_scaling_selection);
+    case KeyContext::RotatingSelection:    return I18N_KEY(key_context_rotating_selection);
+    case KeyContext::MoveTool:             return I18N_KEY(key_context_move_tool);
+    case KeyContext::FreehandTool:         return I18N_KEY(key_context_freehand_tool);
+    case KeyContext::ShapeTool:            return I18N_KEY(key_context_shape_tool);
+    case KeyContext::FramesSelection:      return I18N_KEY(key_context_frames_selection);
+    case KeyContext::Transformation:       return I18N_KEY(key_context_transformation);
+  }
+  return {};
+}
+
+} // namespace app

src/app/ui/key.h

@@ -103,12 +103,42 @@ inline KeyAction operator&(KeyAction a, KeyAction b)
   return KeyAction(int(a) & int(b));
 }
 
+// This is a ui::Shortcut wrapper (just one key shortcut) defined by
+// the app, an extension, or the user (KeySource).
+class AppShortcut : public ui::Shortcut {
+public:
+  AppShortcut(const KeySource source, const ui::Shortcut& shortcut)
+    : Shortcut(shortcut)
+    , m_source(source)
+  {
+  }
+
+  KeySource source() const { return m_source; }
+  const ui::Shortcut& shortcut() const { return *this; }
+
+  // bool operator==(const AppShortcut& other) const { return shortcut.operator==(other.shortcut); }
+  // bool operator!=(const AppShortcut& other) const { return shortcut.operator!=(other.shortcut); }
+
+  // Returns true if this AppShortcut is better for the current
+  // context, compared to another shortcut.
+  bool fitsBetterThan(KeyContext currentContext,
+                      KeyContext thisShortcutContext,
+                      KeyContext otherShortcutContext,
+                      const AppShortcut& otherShortcut) const;
+
+private:
+  KeySource m_source;
+};
+
+using AppShortcuts = ui::ShortcutsT<AppShortcut>;
+
 class Key;
 using KeyPtr = std::shared_ptr<Key>;
 using Keys = std::vector<KeyPtr>;
-using KeySourceShortcutList = std::vector<std::pair<KeySource, ui::Shortcut>>;
 using DragVector = base::Vector2d<double>;
 
+// A set of key shortcuts (AppShortcuts) associated to one command,
+// tool, or specific action.
 class Key {
 public:
   Key(const Key& key);
@@ -119,13 +149,15 @@ public:
   static KeyPtr MakeDragAction(WheelAction dragAction);
 
   KeyType type() const { return m_type; }
-  const ui::Shortcuts& shortcuts() const;
-  const KeySourceShortcutList& addsKeys() const { return m_adds; }
-  const KeySourceShortcutList& delsKeys() const { return m_dels; }
+  const AppShortcuts& shortcuts() const;
+  const AppShortcuts& addsKeys() const { return m_adds; }
+  const AppShortcuts& delsKeys() const { return m_dels; }
 
   void add(const ui::Shortcut& shortcut, KeySource source, KeyboardShortcuts& globalKeys);
-  const ui::Shortcut* isPressed(const ui::Message* msg, KeyContext keyContext) const;
-  const ui::Shortcut* isPressed(const ui::Message* msg) const;
+
+  bool fitsContext(KeyContext keyContext) const;
+  const AppShortcut* isPressed(const ui::Message* msg, KeyContext keyContext) const;
+  const AppShortcut* isPressed(const ui::Message* msg) const;
   bool isPressed() const;
   bool isLooselyPressed() const;
   bool isCommandListed() const;
@@ -161,11 +193,11 @@ public:
 
 private:
   KeyType m_type;
-  KeySourceShortcutList m_adds;
-  KeySourceShortcutList m_dels;
+  AppShortcuts m_adds;
+  AppShortcuts m_dels;
   // Final list of shortcuts after processing the
   // addition/deletion of extension-defined & user-defined keys.
-  mutable std::unique_ptr<ui::Shortcuts> m_shortcuts;
+  mutable std::unique_ptr<AppShortcuts> m_shortcuts;
   KeyContext m_keycontext;
 
   // for KeyType::Command
@@ -178,7 +210,13 @@ private:
   DragVector m_dragVector;   // for KeyType::DragAction
 };
 
-std::string convertKeyContextToUserFriendlyString(KeyContext keyContext);
+// Clears collection with strings that depends on the current
+// language, so they can be reconstructed when they are needed with a
+// new selected language.
+void reset_key_tables_that_depends_on_language();
+
+std::string key_tooltip(const char* str, const Key* key);
+std::string convert_keycontext_to_user_friendly_string(KeyContext keyctx);
 
 } // namespace app
 
@@ -194,6 +232,11 @@ app::WheelAction convert_to(const std::string& from);
 template<>
 std::string convert_to(const app::WheelAction& from);
 
+template<>
+app::KeyContext convert_to(const std::string& from);
+template<>
+std::string convert_to(const app::KeyContext& from);
+
 } // namespace base
 
 #endif

src/app/ui/key_context.h

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2023  Igara Studio S.A.
+// Copyright (C) 2023-2025  Igara Studio S.A.
 // Copyright (C) 2017  David Capello
 //
 // This program is distributed under the terms of
@@ -11,18 +11,59 @@
 
 namespace app {
 
+// Specifies a possible App state/context where the user can press a
+// key and associate different actions/commands in that specific
+// context. Useful to associate the same key to different actions
+// depending on the current context.
+//
+// This list should be sorted in such a way that more specific
+// contexts are below:
+//
+//   Normal > SelectionTool > Transformation
+//
+// This means that keys defined in SelectionTool are still valid in
+// Transformation context.
+//
+// Other key context are just temporary in the Editor, like a mouse
+// drag operation when we are transforming the
+// selection. E.g. TranslatingSelection, ScalingSelection, etc.
 enum class KeyContext {
+
+  // Special context to define keys. This is not used as a "current
+  // key context", but just to define keys for the whole range of key
+  // contexts.
   Any,
+
+  // Regular context in a standby user state, the user is not dragging
+  // or clicking the mouse.
   Normal,
+
+  // The user has a selection on the canvas and a selection-like tool
+  // (selection ink) selected.
   SelectionTool,
+
+  // Special context to modify a specific action when the mouse is
+  // above the handles to translate/scale/rotate or is already
+  // translating/scaling/rotating the selection.
   TranslatingSelection,
   ScalingSelection,
   RotatingSelection,
+
+  // Special context when the user has a specific tool selected to
+  // modify the tool behavior with a key:
   MoveTool,
   FreehandTool,
   ShapeTool,
+
+  // When the mouse wheel is used above the editor.
   MouseWheel,
+
+  // The user has a range of frames/cels selected in the timeline.
   FramesSelection,
+
+  // The user has moved the selection and has yet to drop the pixels
+  // (the user can drop or undo the transformation).
+  Transformation,
 };
 
 } // namespace app

src/app/ui/keyboard_shortcuts.cpp

@@ -22,6 +22,7 @@
 #include "app/tools/ink.h"
 #include "app/tools/tool.h"
 #include "app/tools/tool_box.h"
+#include "app/ui/editor/editor.h"
 #include "app/ui/key.h"
 #include "app/ui/timeline/timeline.h"
 #include "app/ui_context.h"
@@ -39,171 +40,10 @@
 
 #define XML_KEYBOARD_FILE_VERSION "1"
 
-#define I18N_KEY(a)               app::Strings::keyboard_shortcuts_##a()
-
 using namespace tinyxml2;
 
 namespace {
 
-struct KeyShortcutAction {
-  const char* name;
-  std::string userfriendly;
-  app::KeyAction action;
-  app::KeyContext context;
-};
-
-static std::vector<KeyShortcutAction> g_actions;
-
-static const std::vector<KeyShortcutAction>& actions()
-{
-  if (g_actions.empty()) {
-    g_actions = std::vector<KeyShortcutAction>{
-      { "CopySelection",
-       I18N_KEY(copy_selection),
-       app::KeyAction::CopySelection,
-       app::KeyContext::TranslatingSelection },
-      { "SnapToGrid",
-       I18N_KEY(snap_to_grid),
-       app::KeyAction::SnapToGrid,
-       app::KeyContext::TranslatingSelection },
-      { "LockAxis",
-       I18N_KEY(lock_axis),
-       app::KeyAction::LockAxis,
-       app::KeyContext::TranslatingSelection },
-      { "FineControl",
-       I18N_KEY(fine_translating),
-       app::KeyAction::FineControl,
-       app::KeyContext::TranslatingSelection },
-      { "MaintainAspectRatio",
-       I18N_KEY(maintain_aspect_ratio),
-       app::KeyAction::MaintainAspectRatio,
-       app::KeyContext::ScalingSelection     },
-      { "ScaleFromCenter",
-       I18N_KEY(scale_from_center),
-       app::KeyAction::ScaleFromCenter,
-       app::KeyContext::ScalingSelection     },
-      { "FineControl",
-       I18N_KEY(fine_scaling),
-       app::KeyAction::FineControl,
-       app::KeyContext::ScalingSelection     },
-      { "AngleSnap",
-       I18N_KEY(angle_snap),
-       app::KeyAction::AngleSnap,
-       app::KeyContext::RotatingSelection    },
-      { "AddSelection",
-       I18N_KEY(add_selection),
-       app::KeyAction::AddSelection,
-       app::KeyContext::SelectionTool        },
-      { "SubtractSelection",
-       I18N_KEY(subtract_selection),
-       app::KeyAction::SubtractSelection,
-       app::KeyContext::SelectionTool        },
-      { "IntersectSelection",
-       I18N_KEY(intersect_selection),
-       app::KeyAction::IntersectSelection,
-       app::KeyContext::SelectionTool        },
-      { "AutoSelectLayer",
-       I18N_KEY(auto_select_layer),
-       app::KeyAction::AutoSelectLayer,
-       app::KeyContext::MoveTool             },
-      { "StraightLineFromLastPoint",
-       I18N_KEY(line_from_last_point),
-       app::KeyAction::StraightLineFromLastPoint,
-       app::KeyContext::FreehandTool         },
-      { "AngleSnapFromLastPoint",
-       I18N_KEY(angle_from_last_point),
-       app::KeyAction::AngleSnapFromLastPoint,
-       app::KeyContext::FreehandTool         },
-      { "MoveOrigin",
-       I18N_KEY(move_origin),
-       app::KeyAction::MoveOrigin,
-       app::KeyContext::ShapeTool            },
-      { "SquareAspect",
-       I18N_KEY(square_aspect),
-       app::KeyAction::SquareAspect,
-       app::KeyContext::ShapeTool            },
-      { "DrawFromCenter",
-       I18N_KEY(draw_from_center),
-       app::KeyAction::DrawFromCenter,
-       app::KeyContext::ShapeTool            },
-      { "RotateShape",
-       I18N_KEY(rotate_shape),
-       app::KeyAction::RotateShape,
-       app::KeyContext::ShapeTool            },
-      { "LeftMouseButton",
-       I18N_KEY(trigger_left_mouse_button),
-       app::KeyAction::LeftMouseButton,
-       app::KeyContext::Any                  },
-      { "RightMouseButton",
-       I18N_KEY(trigger_right_mouse_button),
-       app::KeyAction::RightMouseButton,
-       app::KeyContext::Any                  }
-    };
-  }
-  return g_actions;
-}
-
-static struct {
-  const char* name;
-  app::KeyContext context;
-} g_contexts[] = {
-  { "",                     app::KeyContext::Any                  },
-  { "Normal",               app::KeyContext::Normal               },
-  { "Selection",            app::KeyContext::SelectionTool        },
-  { "TranslatingSelection", app::KeyContext::TranslatingSelection },
-  { "ScalingSelection",     app::KeyContext::ScalingSelection     },
-  { "RotatingSelection",    app::KeyContext::RotatingSelection    },
-  { "MoveTool",             app::KeyContext::MoveTool             },
-  { "FreehandTool",         app::KeyContext::FreehandTool         },
-  { "ShapeTool",            app::KeyContext::ShapeTool            },
-  { "FramesSelection",      app::KeyContext::FramesSelection      },
-  { NULL,                   app::KeyContext::Any                  }
-};
-
-using Vec = app::DragVector;
-
-struct KeyShortcutWheelAction {
-  const char* name;
-  const std::string userfriendly;
-  Vec vector;
-};
-
-static std::vector<KeyShortcutWheelAction> g_wheel_actions;
-
-static const std::vector<KeyShortcutWheelAction>& wheel_actions()
-{
-  if (g_wheel_actions.empty()) {
-    g_wheel_actions = std::vector<KeyShortcutWheelAction>{
-      { "",               "",                               Vec(0.0,  0.0)   },
-      { "Zoom",           I18N_KEY(zoom),                   Vec(8.0,  0.0)   },
-      { "VScroll",        I18N_KEY(scroll_vertically),      Vec(4.0,  0.0)   },
-      { "HScroll",        I18N_KEY(scroll_horizontally),    Vec(4.0,  0.0)   },
-      { "FgColor",        I18N_KEY(fg_color),               Vec(8.0,  0.0)   },
-      { "BgColor",        I18N_KEY(bg_color),               Vec(8.0,  0.0)   },
-      { "FgTile",         I18N_KEY(fg_tile),                Vec(8.0,  0.0)   },
-      { "BgTile",         I18N_KEY(bg_tile),                Vec(8.0,  0.0)   },
-      { "Frame",          I18N_KEY(change_frame),           Vec(16.0, 0.0)   },
-      { "BrushSize",      I18N_KEY(change_brush_size),      Vec(4.0,  0.0)   },
-      { "BrushAngle",     I18N_KEY(change_brush_angle),     Vec(-4.0, 0.0)   },
-      { "ToolSameGroup",  I18N_KEY(change_tool_same_group), Vec(8.0,  0.0)   },
-      { "ToolOtherGroup", I18N_KEY(change_tool),            Vec(0.0,  -8.0)  },
-      { "Layer",          I18N_KEY(change_layer),           Vec(0.0,  8.0)   },
-      { "InkType",        I18N_KEY(change_ink_type),        Vec(0.0,  -16.0) },
-      { "InkOpacity",     I18N_KEY(change_ink_opacity),     Vec(0.0,  1.0)   },
-      { "LayerOpacity",   I18N_KEY(change_layer_opacity),   Vec(0.0,  1.0)   },
-      { "CelOpacity",     I18N_KEY(change_cel_opacity),     Vec(0.0,  1.0)   },
-      { "Alpha",          I18N_KEY(color_alpha),            Vec(4.0,  0.0)   },
-      { "HslHue",         I18N_KEY(color_hsl_hue),          Vec(1.0,  0.0)   },
-      { "HslSaturation",  I18N_KEY(color_hsl_saturation),   Vec(4.0,  0.0)   },
-      { "HslLightness",   I18N_KEY(color_hsl_lightness),    Vec(0.0,  4.0)   },
-      { "HsvHue",         I18N_KEY(color_hsv_hue),          Vec(1.0,  0.0)   },
-      { "HsvSaturation",  I18N_KEY(color_hsv_saturation),   Vec(4.0,  0.0)   },
-      { "HsvValue",       I18N_KEY(color_hsv_value),        Vec(0.0,  4.0)   }
-    };
-  }
-  return g_wheel_actions;
-}
-
 const char* get_shortcut(XMLElement* elem)
 {
   const char* shortcut = NULL;
@@ -225,384 +65,12 @@ const char* get_shortcut(XMLElement* elem)
   return shortcut;
 }
 
-std::string get_user_friendly_string_for_keyaction(app::KeyAction action, app::KeyContext context)
-{
-  for (const auto& a : actions()) {
-    if (action == a.action && context == a.context)
-      return a.userfriendly;
-  }
-  return std::string();
-}
-
-std::string get_user_friendly_string_for_wheelaction(app::WheelAction wheelAction)
-{
-  int c = int(wheelAction);
-  if (c >= int(app::WheelAction::First) && c <= int(app::WheelAction::Last)) {
-    return wheel_actions()[c].userfriendly;
-  }
-  else
-    return std::string();
-}
-
-void erase_shortcut(app::KeySourceShortcutList& kvs,
-                    const app::KeySource source,
-                    const ui::Shortcut& shortcut)
-{
-  for (auto it = kvs.begin(); it != kvs.end();) {
-    auto& kv = *it;
-    if (kv.first == source && kv.second == shortcut) {
-      it = kvs.erase(it);
-    }
-    else
-      ++it;
-  }
-}
-
-void erase_shortcuts(app::KeySourceShortcutList& kvs, const app::KeySource source)
-{
-  for (auto it = kvs.begin(); it != kvs.end();) {
-    auto& kv = *it;
-    if (kv.first == source) {
-      it = kvs.erase(it);
-    }
-    else
-      ++it;
-  }
-}
-
-} // anonymous namespace
-
-namespace base {
-
-template<>
-app::KeyAction convert_to(const std::string& from)
-{
-  for (const auto& a : actions()) {
-    if (from == a.name)
-      return a.action;
-  }
-  return app::KeyAction::None;
-}
-
-template<>
-std::string convert_to(const app::KeyAction& from)
-{
-  for (const auto& a : actions()) {
-    if (from == a.action)
-      return a.name;
-  }
-  return std::string();
-}
-
-template<>
-app::WheelAction convert_to(const std::string& from)
-{
-  for (int c = int(app::WheelAction::First); c <= int(app::WheelAction::Last); ++c) {
-    if (from == wheel_actions()[c].name)
-      return (app::WheelAction)c;
-  }
-  return app::WheelAction::None;
-}
-
-template<>
-std::string convert_to(const app::WheelAction& from)
-{
-  int c = int(from);
-  if (c >= int(app::WheelAction::First) && c <= int(app::WheelAction::Last)) {
-    return wheel_actions()[c].name;
-  }
-  else
-    return std::string();
-}
-
-template<>
-app::KeyContext convert_to(const std::string& from)
-{
-  for (int c = 0; g_contexts[c].name; ++c) {
-    if (from == g_contexts[c].name)
-      return g_contexts[c].context;
-  }
-  return app::KeyContext::Any;
-}
-
-template<>
-std::string convert_to(const app::KeyContext& from)
-{
-  for (int c = 0; g_contexts[c].name; ++c) {
-    if (from == g_contexts[c].context)
-      return g_contexts[c].name;
-  }
-  return std::string();
-}
-
-} // namespace base
+} // namespace
 
 namespace app {
 
 using namespace ui;
 
-//////////////////////////////////////////////////////////////////////
-// Key
-
-Key::Key(const Key& k)
-  : m_type(k.m_type)
-  , m_adds(k.m_adds)
-  , m_dels(k.m_dels)
-  , m_keycontext(k.m_keycontext)
-{
-  switch (m_type) {
-    case KeyType::Command:
-      m_command = k.m_command;
-      m_params = k.m_params;
-      break;
-    case KeyType::Tool:
-    case KeyType::Quicktool: m_tool = k.m_tool; break;
-    case KeyType::Action:    m_action = k.m_action; break;
-    case KeyType::WheelAction:
-      m_action = k.m_action;
-      m_wheelAction = k.m_wheelAction;
-      break;
-    case KeyType::DragAction:
-      m_action = k.m_action;
-      m_wheelAction = k.m_wheelAction;
-      m_dragVector = k.m_dragVector;
-      break;
-  }
-}
-
-Key::Key(Command* command, const Params& params, const KeyContext keyContext)
-  : m_type(KeyType::Command)
-  , m_keycontext(keyContext)
-  , m_command(command)
-  , m_params(params)
-{
-}
-
-Key::Key(const KeyType type, tools::Tool* tool)
-  : m_type(type)
-  , m_keycontext(KeyContext::Any)
-  , m_tool(tool)
-{
-}
-
-Key::Key(const KeyAction action, const KeyContext keyContext)
-  : m_type(KeyType::Action)
-  , m_keycontext(keyContext)
-  , m_action(action)
-{
-  if (m_keycontext != KeyContext::Any)
-    return;
-
-  // Automatic key context
-  switch (action) {
-    case KeyAction::None:                      m_keycontext = KeyContext::Any; break;
-    case KeyAction::CopySelection:
-    case KeyAction::SnapToGrid:
-    case KeyAction::LockAxis:
-    case KeyAction::FineControl:               m_keycontext = KeyContext::TranslatingSelection; break;
-    case KeyAction::AngleSnap:                 m_keycontext = KeyContext::RotatingSelection; break;
-    case KeyAction::MaintainAspectRatio:
-    case KeyAction::ScaleFromCenter:           m_keycontext = KeyContext::ScalingSelection; break;
-    case KeyAction::AddSelection:
-    case KeyAction::SubtractSelection:
-    case KeyAction::IntersectSelection:        m_keycontext = KeyContext::SelectionTool; break;
-    case KeyAction::AutoSelectLayer:           m_keycontext = KeyContext::MoveTool; break;
-    case KeyAction::StraightLineFromLastPoint:
-    case KeyAction::AngleSnapFromLastPoint:    m_keycontext = KeyContext::FreehandTool; break;
-    case KeyAction::MoveOrigin:
-    case KeyAction::SquareAspect:
-    case KeyAction::DrawFromCenter:
-    case KeyAction::RotateShape:               m_keycontext = KeyContext::ShapeTool; break;
-    case KeyAction::LeftMouseButton:           m_keycontext = KeyContext::Any; break;
-    case KeyAction::RightMouseButton:          m_keycontext = KeyContext::Any; break;
-  }
-}
-
-Key::Key(const WheelAction wheelAction)
-  : m_type(KeyType::WheelAction)
-  , m_keycontext(KeyContext::MouseWheel)
-  , m_action(KeyAction::None)
-  , m_wheelAction(wheelAction)
-{
-}
-
-// static
-KeyPtr Key::MakeDragAction(WheelAction dragAction)
-{
-  KeyPtr k(new Key(dragAction));
-  k->m_type = KeyType::DragAction;
-  k->m_keycontext = KeyContext::Any;
-  k->m_dragVector = wheel_actions()[(int)dragAction].vector;
-  return k;
-}
-
-const ui::Shortcuts& Key::shortcuts() const
-{
-  if (!m_shortcuts) {
-    m_shortcuts = std::make_unique<ui::Shortcuts>();
-
-    // Add default keys
-    for (const auto& kv : m_adds) {
-      if (kv.first == KeySource::Original)
-        m_shortcuts->add(kv.second);
-    }
-
-    // Delete/add extension-defined keys
-    for (const auto& kv : m_dels) {
-      if (kv.first == KeySource::ExtensionDefined)
-        m_shortcuts->remove(kv.second);
-      else {
-        ASSERT(kv.first != KeySource::Original);
-      }
-    }
-    for (const auto& kv : m_adds) {
-      if (kv.first == KeySource::ExtensionDefined)
-        m_shortcuts->add(kv.second);
-    }
-
-    // Delete/add user-defined keys
-    for (const auto& kv : m_dels) {
-      if (kv.first == KeySource::UserDefined)
-        m_shortcuts->remove(kv.second);
-    }
-    for (const auto& kv : m_adds) {
-      if (kv.first == KeySource::UserDefined)
-        m_shortcuts->add(kv.second);
-    }
-  }
-  return *m_shortcuts;
-}
-
-void Key::add(const ui::Shortcut& shortcut, const KeySource source, KeyboardShortcuts& globalKeys)
-{
-  m_adds.emplace_back(source, shortcut);
-  m_shortcuts.reset();
-
-  // Remove the shortcut from other commands
-  if (source == KeySource::ExtensionDefined || source == KeySource::UserDefined) {
-    erase_shortcut(m_dels, source, shortcut);
-
-    globalKeys.disableShortcut(shortcut, source, m_keycontext, this);
-  }
-}
-
-const ui::Shortcut* Key::isPressed(const Message* msg, const KeyContext keyContext) const
-{
-  if (const auto* keyMsg = dynamic_cast<const KeyMessage*>(msg)) {
-    for (const Shortcut& shortcut : shortcuts()) {
-      if (shortcut.isPressed(keyMsg->modifiers(), keyMsg->scancode(), keyMsg->unicodeChar()) &&
-          (m_keycontext == KeyContext::Any || m_keycontext == keyContext)) {
-        return &shortcut;
-      }
-    }
-  }
-  else if (const auto* mouseMsg = dynamic_cast<const MouseMessage*>(msg)) {
-    for (const Shortcut& shortcut : shortcuts()) {
-      if ((shortcut.modifiers() == mouseMsg->modifiers()) &&
-          (m_keycontext == KeyContext::Any ||
-           // TODO we could have multiple mouse wheel key-context,
-           // like "sprite editor" context, or "timeline" context,
-           // etc.
-           m_keycontext == KeyContext::MouseWheel)) {
-        return &shortcut;
-      }
-    }
-  }
-  return nullptr;
-}
-
-const ui::Shortcut* Key::isPressed(const Message* msg) const
-{
-  return isPressed(msg, KeyboardShortcuts::getCurrentKeyContext());
-}
-
-bool Key::isPressed() const
-{
-  const auto& ss = this->shortcuts();
-  return std::any_of(ss.begin(), ss.end(), [](const Shortcut& shortcut) {
-    return shortcut.isPressed();
-  });
-}
-
-bool Key::isLooselyPressed() const
-{
-  const auto& ss = this->shortcuts();
-  return std::any_of(ss.begin(), ss.end(), [](const Shortcut& shortcut) {
-    return shortcut.isLooselyPressed();
-  });
-}
-
-bool Key::isCommandListed() const
-{
-  return type() == KeyType::Command && command()->isListed(params());
-}
-
-bool Key::hasShortcut(const ui::Shortcut& shortcut) const
-{
-  return shortcuts().has(shortcut);
-}
-
-bool Key::hasUserDefinedShortcuts() const
-{
-  return std::any_of(m_adds.begin(), m_adds.end(), [](const auto& kv) {
-    return (kv.first == KeySource::UserDefined);
-  });
-}
-
-void Key::disableShortcut(const ui::Shortcut& shortcut, const KeySource source)
-{
-  // It doesn't make sense that the default keyboard shortcuts file
-  // (gui.xml) removes some shortcut.
-  ASSERT(source != KeySource::Original);
-
-  erase_shortcut(m_adds, source, shortcut);
-  erase_shortcut(m_dels, source, shortcut);
-
-  m_dels.emplace_back(source, shortcut);
-  m_shortcuts.reset();
-}
-
-void Key::reset()
-{
-  erase_shortcuts(m_adds, KeySource::UserDefined);
-  erase_shortcuts(m_dels, KeySource::UserDefined);
-  m_shortcuts.reset();
-}
-
-void Key::copyOriginalToUser()
-{
-  // Erase all user-defined keys
-  erase_shortcuts(m_adds, KeySource::UserDefined);
-  erase_shortcuts(m_dels, KeySource::UserDefined);
-
-  // Then copy all original & extension-defined keys as user-defined
-  auto copy = m_adds;
-  for (const auto& kv : copy)
-    m_adds.emplace_back(KeySource::UserDefined, kv.second);
-  m_shortcuts.reset();
-}
-
-std::string Key::triggerString() const
-{
-  switch (m_type) {
-    case KeyType::Command:   m_command->loadParams(m_params); return m_command->friendlyName();
-    case KeyType::Tool:
-    case KeyType::Quicktool: {
-      std::string text = m_tool->getText();
-      if (m_type == KeyType::Quicktool)
-        text += " (quick)";
-      return text;
-    }
-    case KeyType::Action:      return get_user_friendly_string_for_keyaction(m_action, m_keycontext);
-    case KeyType::WheelAction:
-    case KeyType::DragAction:  return get_user_friendly_string_for_wheelaction(m_wheelAction);
-  }
-  return "Unknown";
-}
-
-//////////////////////////////////////////////////////////////////////
-// KeyboardShortcuts
-
 static std::unique_ptr<KeyboardShortcuts> g_singleton;
 
 // static
@@ -621,12 +89,10 @@ void KeyboardShortcuts::destroyInstance()
 
 KeyboardShortcuts::KeyboardShortcuts()
 {
-  ASSERT(Strings::instance());
-  Strings::instance()->LanguageChange.connect([] {
-    // Clear collections so they are re-constructed with the new language
-    g_actions.clear();
-    g_wheel_actions.clear();
-  });
+  // Strings instance can be nullptr in tests.
+  if (auto* strings = Strings::instance()) {
+    strings->LanguageChange.connect([] { reset_key_tables_that_depends_on_language(); });
+  }
 }
 
 KeyboardShortcuts::~KeyboardShortcuts()
@@ -903,12 +369,12 @@ void KeyboardShortcuts::exportKeys(XMLElement* parent, KeyType type)
       continue;
 
     for (const auto& kv : key->delsKeys())
-      if (kv.first == KeySource::UserDefined)
-        exportShortcut(parent, key.get(), kv.second, true);
+      if (kv.source() == KeySource::UserDefined)
+        exportShortcut(parent, key.get(), kv, true);
 
     for (const auto& kv : key->addsKeys())
-      if (kv.first == KeySource::UserDefined)
-        exportShortcut(parent, key.get(), kv.second, false);
+      if (kv.source() == KeySource::UserDefined)
+        exportShortcut(parent, key.get(), kv, false);
   }
 }
 
@@ -1078,6 +544,12 @@ void KeyboardShortcuts::disableShortcut(const ui::Shortcut& shortcut,
 // static
 KeyContext KeyboardShortcuts::getCurrentKeyContext()
 {
+  // For shortcuts to Apply/Cancel transformation/moving pixels state.
+  auto* editor = Editor::activeEditor();
+  if (editor && editor->isMovingPixels()) {
+    return KeyContext::Transformation;
+  }
+
   auto* ctx = UIContext::instance();
   Doc* doc = ctx->activeDocument();
   if (doc && doc->isMaskVisible() &&
@@ -1104,23 +576,47 @@ KeyContext KeyboardShortcuts::getCurrentKeyContext()
   return KeyContext::Normal;
 }
 
-bool KeyboardShortcuts::getCommandFromKeyMessage(const Message* msg,
-                                                 Command** command,
-                                                 Params* params)
+KeyPtr KeyboardShortcuts::findBestKeyFromMessage(const ui::Message* msg,
+                                                 KeyContext currentKeyContext,
+                                                 std::optional<KeyType> filterByType) const
 {
-  const KeyContext contexts[] = { getCurrentKeyContext(), KeyContext::Normal };
+  const KeyContext contexts[] = { currentKeyContext, KeyContext::Normal };
   int n = (contexts[0] != contexts[1] ? 2 : 1);
+  KeyPtr bestKey = nullptr;
+  const AppShortcut* bestShortcut = nullptr;
   for (int i = 0; i < n; ++i) {
-    for (KeyPtr& key : m_keys) {
-      if (key->type() == KeyType::Command && key->isPressed(msg, contexts[i])) {
-        if (command)
-          *command = key->command();
-        if (params)
-          *params = key->params();
-        return true;
+    for (const KeyPtr& key : m_keys) {
+      // Skip keys that are not for the specific KeyType (e.g. only for commands).
+      if (filterByType.has_value() && key->type() != *filterByType)
+        continue;
+
+      const AppShortcut* shortcut = key->isPressed(msg, contexts[i]);
+      if (shortcut && (!bestKey || shortcut->fitsBetterThan(currentKeyContext,
+                                                            key->keycontext(),
+                                                            bestKey->keycontext(),
+                                                            *bestShortcut))) {
+        bestKey = key;
+        bestShortcut = shortcut;
       }
     }
   }
+  return bestKey;
+}
+
+bool KeyboardShortcuts::getCommandFromKeyMessage(const ui::Message* msg,
+                                                 Command** command,
+                                                 Params* params,
+                                                 KeyContext currentKeyContext)
+{
+  KeyPtr key = findBestKeyFromMessage(msg, currentKeyContext, std::make_optional(KeyType::Command));
+  if (key) {
+    ASSERT(key->type() == KeyType::Command);
+    if (command)
+      *command = key->command();
+    if (params)
+      *params = key->params();
+    return true;
+  }
   return false;
 }
 
@@ -1164,10 +660,10 @@ WheelAction KeyboardShortcuts::getWheelActionFromMouseMessage(const KeyContext c
                                                               const ui::Message* msg)
 {
   WheelAction wheelAction = WheelAction::None;
-  const ui::Shortcut* bestShortcut = nullptr;
+  const AppShortcut* bestShortcut = nullptr;
   for (const KeyPtr& key : m_keys) {
     if (key->type() == KeyType::WheelAction && key->keycontext() == context) {
-      const ui::Shortcut* shortcut = key->isPressed(msg);
+      const AppShortcut* shortcut = key->isPressed(msg);
       if ((shortcut) && (!bestShortcut || bestShortcut->modifiers() < shortcut->modifiers())) {
         bestShortcut = shortcut;
         wheelAction = key->wheelAction();
@@ -1183,7 +679,7 @@ Keys KeyboardShortcuts::getDragActionsFromKeyMessage(const ui::Message* msg)
   Keys keys;
   for (const KeyPtr& key : m_keys) {
     if (key->type() == KeyType::DragAction) {
-      const ui::Shortcut* shortcut = key->isPressed(msg);
+      const AppShortcut* shortcut = key->isPressed(msg);
       if (shortcut) {
         keys.push_back(key);
       }
@@ -1309,34 +805,4 @@ void KeyboardShortcuts::addMissingKeysForCommands()
   }
 }
 
-std::string key_tooltip(const char* str, const app::Key* key)
-{
-  std::string res;
-  if (str)
-    res += str;
-  if (key && !key->shortcuts().empty()) {
-    res += " (";
-    res += key->shortcuts().front().toString();
-    res += ")";
-  }
-  return res;
-}
-
-std::string convertKeyContextToUserFriendlyString(KeyContext keyContext)
-{
-  switch (keyContext) {
-    case KeyContext::Any:                  return std::string();
-    case KeyContext::Normal:               return I18N_KEY(key_context_normal);
-    case KeyContext::SelectionTool:        return I18N_KEY(key_context_selection);
-    case KeyContext::TranslatingSelection: return I18N_KEY(key_context_translating_selection);
-    case KeyContext::ScalingSelection:     return I18N_KEY(key_context_scaling_selection);
-    case KeyContext::RotatingSelection:    return I18N_KEY(key_context_rotating_selection);
-    case KeyContext::MoveTool:             return I18N_KEY(key_context_move_tool);
-    case KeyContext::FreehandTool:         return I18N_KEY(key_context_freehand_tool);
-    case KeyContext::ShapeTool:            return I18N_KEY(key_context_shape_tool);
-    case KeyContext::FramesSelection:      return I18N_KEY(key_context_frames_selection);
-  }
-  return std::string();
-}
-
 } // namespace app

src/app/ui/keyboard_shortcuts.h

@@ -12,6 +12,8 @@
 #include "app/ui/key.h"
 #include "obs/signal.h"
 
+#include <optional>
+
 namespace tinyxml2 {
 class XMLElement;
 }
@@ -59,7 +61,18 @@ public:
                        const Key* newKey);
 
   static KeyContext getCurrentKeyContext();
-  bool getCommandFromKeyMessage(const ui::Message* msg, Command** command, Params* params);
+
+  KeyPtr findBestKeyFromMessage(
+    const ui::Message* msg,
+    KeyContext currentKeyContext = KeyboardShortcuts::getCurrentKeyContext(),
+    std::optional<KeyType> filterByType = std::nullopt) const;
+
+  bool getCommandFromKeyMessage(
+    const ui::Message* msg,
+    Command** command,
+    Params* params,
+    KeyContext currentKeyContext = KeyboardShortcuts::getCurrentKeyContext());
+
   tools::Tool* getCurrentQuicktool(tools::Tool* currentTool);
   KeyAction getCurrentActionModifiers(KeyContext context);
   WheelAction getWheelActionFromMouseMessage(KeyContext context, const ui::Message* msg);
@@ -85,8 +98,6 @@ private:
   mutable Keys m_keys;
 };
 
-std::string key_tooltip(const char* str, const Key* key);
-
 inline std::string key_tooltip(const char* str,
                                const char* commandName,
                                const Params& params = Params(),

src/app/ui/keyboard_shortcuts_tests.cpp

@@ -0,0 +1,184 @@
+// Aseprite
+// Copyright (C) 2025  Igara Studio S.A.
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#ifdef HAVE_CONFIG_H
+  #include "config.h"
+#endif
+
+#include <gtest/gtest.h>
+
+#include "app/ui/keyboard_shortcuts.h"
+
+#include "app/app.h"
+#include "app/cli/app_options.h"
+#include "app/commands/command.h"
+#include "app/commands/command_ids.h"
+#include "os/system.h"
+#include "ui/app_state.h"
+#include "ui/message.h"
+
+using namespace app;
+using namespace ui;
+
+static KeyboardShortcuts* ks = nullptr;
+
+#define DEFINE_KEY(commandId, scancode, keycontext)                                                \
+  {                                                                                                \
+    KeyPtr k = ks->command(CommandId::commandId(), {}, keycontext);                                \
+    k->add(ui::Shortcut(kKeyNoneModifier, scancode, 0), KeySource::Original, *ks);                 \
+  }
+
+#define DEFINE_USER_KEY(commandId, scancode, keycontext)                                           \
+  {                                                                                                \
+    KeyPtr k = ks->command(CommandId::commandId(), {}, keycontext);                                \
+    k->add(ui::Shortcut(kKeyNoneModifier, scancode, 0), KeySource::UserDefined, *ks);              \
+  }
+
+#define EXPECT_COMMAND_FOR_KEY(commandId, scancode, keycontext)                                    \
+  {                                                                                                \
+    KeyMessage msg(kKeyDownMessage, scancode, kKeyNoneModifier, 0, 0);                             \
+    Command* cmd = nullptr;                                                                        \
+    EXPECT_TRUE(ks->getCommandFromKeyMessage(&msg, &cmd, nullptr, keycontext));                    \
+    ASSERT_TRUE(cmd != nullptr) << "command not found for key";                                    \
+    EXPECT_EQ(CommandId::commandId(), cmd->id()) << "other command found: " << cmd->id();          \
+  }
+
+#define NO_COMMAND_FOR_KEY(scancode, keycontext)                                                   \
+  {                                                                                                \
+    KeyMessage msg(kKeyDownMessage, scancode, kKeyNoneModifier, 0, 0);                             \
+    Command* cmd = nullptr;                                                                        \
+    EXPECT_FALSE(ks->getCommandFromKeyMessage(&msg, &cmd, nullptr, keycontext));                   \
+    ASSERT_TRUE(cmd == nullptr) << "command found for key: " << cmd->id();                         \
+  }
+TEST(KeyboardShortcuts, Basic)
+{
+  ks->clear();
+
+  KeyPtr k = ks->command(CommandId::Undo(), {}, KeyContext::Any);
+
+  // Simulate a key press and check that the command is not yet
+  // associated to the 'Z' key.
+  {
+    KeyMessage msg(kKeyDownMessage, kKeyZ, kKeyNoneModifier, 0, 0);
+    Command* cmd = nullptr;
+    Params params;
+    EXPECT_FALSE(ks->getCommandFromKeyMessage(&msg, &cmd, &params));
+  }
+
+  // Associate the command to the 'Z' key and check.
+  k->add(ui::Shortcut(kKeyNoneModifier, kKeyZ, 0), KeySource::Original, *ks);
+  EXPECT_COMMAND_FOR_KEY(Undo, kKeyZ, KeyContext::Normal);
+}
+
+TEST(KeyboardShortcuts, KeyContexts)
+{
+  ks->clear();
+
+  DEFINE_KEY(Cancel, kKeyEsc, KeyContext::Any);
+  DEFINE_KEY(GotoPreviousFrame, kKeyLeft, KeyContext::Normal);
+  DEFINE_KEY(PlayAnimation, kKeyEnter, KeyContext::Normal);
+  DEFINE_KEY(Clear, kKeyBackspace, KeyContext::Normal);
+  DEFINE_KEY(MoveMask, kKeyLeft, KeyContext::SelectionTool);
+  DEFINE_KEY(Apply, kKeyEnter, KeyContext::Transformation);
+  DEFINE_KEY(Cut, kKeyX, KeyContext::SelectionTool);
+
+  EXPECT_COMMAND_FOR_KEY(Cancel, kKeyEsc, KeyContext::Normal);
+  EXPECT_COMMAND_FOR_KEY(GotoPreviousFrame, kKeyLeft, KeyContext::Normal);
+  EXPECT_COMMAND_FOR_KEY(MoveMask, kKeyLeft, KeyContext::SelectionTool);
+  EXPECT_COMMAND_FOR_KEY(PlayAnimation, kKeyEnter, KeyContext::Normal);
+  EXPECT_COMMAND_FOR_KEY(PlayAnimation, kKeyEnter, KeyContext::SelectionTool);
+  EXPECT_COMMAND_FOR_KEY(Apply, kKeyEnter, KeyContext::Transformation);
+  EXPECT_COMMAND_FOR_KEY(Clear, kKeyBackspace, KeyContext::Normal);
+  EXPECT_COMMAND_FOR_KEY(Clear, kKeyBackspace, KeyContext::SelectionTool);
+  EXPECT_COMMAND_FOR_KEY(Clear, kKeyBackspace, KeyContext::Transformation);
+
+  NO_COMMAND_FOR_KEY(kKeyX, KeyContext::Normal);
+  EXPECT_COMMAND_FOR_KEY(Cut, kKeyX, KeyContext::SelectionTool);
+  EXPECT_COMMAND_FOR_KEY(Cut, kKeyX, KeyContext::Transformation);
+}
+
+TEST(KeyboardShortcuts, UserDefinedPriority)
+{
+  ks->clear();
+
+  DEFINE_KEY(Undo, kKeyZ, KeyContext::Normal);
+  EXPECT_COMMAND_FOR_KEY(Undo, kKeyZ, KeyContext::Normal);
+
+  DEFINE_USER_KEY(Redo, kKeyZ, KeyContext::Normal);
+  EXPECT_COMMAND_FOR_KEY(Redo, kKeyZ, KeyContext::Normal);
+
+  DEFINE_KEY(MoveMask, kKeyLeft, KeyContext::SelectionTool);
+  DEFINE_USER_KEY(GotoPreviousFrame, kKeyLeft, KeyContext::Normal);
+  EXPECT_COMMAND_FOR_KEY(MoveMask, kKeyLeft, KeyContext::SelectionTool);
+
+  DEFINE_USER_KEY(GotoPreviousFrame, kKeyLeft, KeyContext::Any);
+  EXPECT_COMMAND_FOR_KEY(GotoPreviousFrame, kKeyLeft, KeyContext::SelectionTool);
+}
+
+TEST(KeyboardShortcuts, SpecificContextHasMorePriorityButNotIfItsUserDefined)
+{
+  ks->clear();
+  DEFINE_KEY(Cancel, kKeyEsc, KeyContext::Any);
+  DEFINE_KEY(Undo, kKeyEsc, KeyContext::Transformation);
+
+  // Pressing "Esc" in "Transformation" context should run "Undo",
+  // although "Cancel" is defined for "Any" context, a more specific
+  // context should have more priority.
+  EXPECT_COMMAND_FOR_KEY(Undo, kKeyEsc, KeyContext::Transformation);
+
+  // But an user-defined key, even for Any context, will overwrite the
+  // app-defined shortcut in all contexts.
+  DEFINE_USER_KEY(Zoom, kKeyEsc, KeyContext::Any);
+  EXPECT_COMMAND_FOR_KEY(Zoom, kKeyEsc, KeyContext::Transformation);
+}
+
+// Test that we can configure the Left key to always Undo when the
+// default configuration says that the Left key does other actions in
+// different contexts.
+//
+// Related issue: https://github.com/aseprite/aseprite/issues/5390
+TEST(KeyboardShortcuts, UndoWithLeftAndRight)
+{
+  ks->clear();
+
+  DEFINE_KEY(GotoPreviousFrame, kKeyLeft, KeyContext::Normal);
+  DEFINE_KEY(MoveMask, kKeyLeft, KeyContext::SelectionTool);
+  EXPECT_COMMAND_FOR_KEY(GotoPreviousFrame, kKeyLeft, KeyContext::Normal);
+  EXPECT_COMMAND_FOR_KEY(MoveMask, kKeyLeft, KeyContext::SelectionTool);
+  // "Transformation" is a sub-context of "Selection" context
+  EXPECT_COMMAND_FOR_KEY(MoveMask, kKeyLeft, KeyContext::Transformation);
+
+  // Now we try defining the "Left" key for "Any" context overwriting it in all contexts.
+  DEFINE_USER_KEY(Undo, kKeyLeft, KeyContext::Any);
+  EXPECT_COMMAND_FOR_KEY(Undo, kKeyLeft, KeyContext::Normal);
+  EXPECT_COMMAND_FOR_KEY(Undo, kKeyLeft, KeyContext::SelectionTool);
+  EXPECT_COMMAND_FOR_KEY(Undo, kKeyLeft, KeyContext::Transformation);
+}
+
+TEST(KeyboardShortcuts, FramesSelection)
+{
+  ks->clear();
+
+  DEFINE_KEY(LayerProperties, kKeyF2, KeyContext::Normal);
+  DEFINE_KEY(SetLoopSection, kKeyF2, KeyContext::FramesSelection);
+  EXPECT_COMMAND_FOR_KEY(LayerProperties, kKeyF2, KeyContext::Normal);
+  EXPECT_COMMAND_FOR_KEY(SetLoopSection, kKeyF2, KeyContext::FramesSelection);
+}
+
+int app_main(int argc, char* argv[])
+{
+  os::SystemRef system = os::System::make();
+  const char* argv2[] = { argv[0] };
+  app::AppOptions options(sizeof(argv2) / sizeof(argv2[0]), argv2);
+  app::App app;
+  app.initialize(options);
+  app.run(false);
+
+  ks = KeyboardShortcuts::instance();
+
+  ::testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}

src/app/ui/news_listbox.cpp

@@ -177,9 +177,6 @@ protected:
     ui::Style* style = theme->styles.newsItem();
     ui::Style* styleDetail = theme->styles.newsItemDetail();
 
-    text::FontMetrics metrics;
-    font()->metrics(&metrics);
-
     gfx::Size textSize = theme->calcSizeHint(this, style);
     gfx::Rect textBounds(bounds.x, bounds.y, bounds.w, textSize.h);
     gfx::Rect detailsBounds(bounds.x, bounds.y + textSize.h, bounds.w, bounds.h - textSize.h);
@@ -187,19 +184,28 @@ protected:
     gfx::Border border = theme->calcBorder(this, style);
     gfx::Border borderDetail = theme->calcBorder(this, styleDetail);
 
-    PaintWidgetPartInfo info(this);
-    info.text = &m_title;
-    info.baseline = border.top() - metrics.ascent;
-    theme->paintWidgetPart(g, style, bounds, info);
+    if (!m_titleBlob)
+      m_titleBlob = text::TextBlob::MakeWithShaper(theme->fontMgr(), font(), m_title);
 
-    info.text = &m_desc;
-    info.baseline += border.bottom() + borderDetail.top() + metrics.descent - metrics.ascent;
-    theme->paintWidgetPart(g, styleDetail, detailsBounds, info);
+    PaintWidgetPartInfo info(this);
+    info.baseline = border.top();
+    if (m_titleBlob) {
+      info.textBlob = m_titleBlob;
+      info.baseline += m_titleBlob->baseline();
+      theme->paintWidgetPart(g, style, bounds, info);
+      info.baseline += border.bottom();
+
+      info.text = &m_desc;
+      info.textBlob = nullptr;
+      info.baseline += borderDetail.top() + m_titleBlob->baseline();
+      theme->paintWidgetPart(g, styleDetail, detailsBounds, info);
+    }
   }
 
 private:
   std::string m_title;
   std::string m_desc;
+  text::TextBlobRef m_titleBlob;
 };
 
 class ProblemsItem : public NewsItem {

src/app/ui/palette_view.cpp

@@ -13,6 +13,7 @@
 
 #include "app/app.h"
 #include "app/color.h"
+#include "app/color_spaces.h"
 #include "app/color_utils.h"
 #include "app/commands/commands.h"
 #include "app/modules/gfx.h"
@@ -307,7 +308,8 @@ public:
     if (tileImage) {
       int w = tileImage->width();
       int h = tileImage->height();
-      os::SurfaceRef surface = os::System::instance()->makeRgbaSurface(w, h);
+      os::SurfaceRef surface =
+        os::System::instance()->makeRgbaSurface(w, h, get_current_color_space());
       convert_image_to_surface(tileImage.get(),
                                get_current_palette(),
                                surface.get(),

src/app/ui/skin/skin_theme.cpp

@@ -1350,6 +1350,7 @@ public:
     , m_h(h)
   {
     m_widget->getEntryThemeInfo(&m_index, &m_caret, &m_state, &m_range);
+    m_suffixIndex = m_widget->text().size();
   }
 
   int index() const { return m_index; }
@@ -1369,6 +1370,11 @@ public:
     bg = ColorNone;
     fg = colors.text();
 
+    // Suffix text
+    if (m_index >= m_suffixIndex) {
+      fg = colors.entrySuffix();
+    }
+
     // Selected
     if ((m_index >= m_range.from) && (m_index < m_range.to)) {
       if (m_widget->hasFocus())
@@ -1433,6 +1439,7 @@ private:
   int m_lastX; // Last position used to fill the background
   int m_y, m_h;
   int m_charStartX;
+  int m_suffixIndex;
 };
 
 } // anonymous namespace
@@ -1445,8 +1452,10 @@ void SkinTheme::drawEntryText(ui::Graphics* g, ui::Entry* widget)
   DrawEntryTextDelegate delegate(widget, g, bounds.origin(), widget->textHeight());
   int scroll = delegate.index();
 
-  if (!widget->text().empty()) {
-    const std::string& textString = widget->text();
+  // Full text to paint: widget text + suffix
+  const std::string textString = widget->text() + widget->getSuffix();
+
+  if (!textString.empty()) {
     base::utf8_decode dec(textString);
     auto pos = dec.pos();
     for (int i = 0; i < scroll && dec.next(); ++i)
@@ -1454,38 +1463,28 @@ void SkinTheme::drawEntryText(ui::Graphics* g, ui::Entry* widget)
 
     IntersectClip clip(g, bounds);
     if (clip) {
-      g->drawTextWithDelegate(
-        std::string(pos, textString.end()), // TODO use a string_view()
-        colors.text(),
-        ColorNone,
-        gfx::Point(bounds.x, widget->textBaseline() - widget->textBlob()->baseline()),
-        &delegate);
-    }
-  }
+      int baselineAdjustment = widget->textBaseline();
+      if (auto blob = widget->textBlob()) {
+        baselineAdjustment -= blob->baseline();
+      }
+      else {
+        text::FontMetrics metrics;
+        widget->font()->metrics(&metrics);
+        baselineAdjustment += metrics.ascent;
+      }
 
-  bounds.x += delegate.textBounds().w;
-
-  // Draw suffix if there is enough space
-  if (!widget->getSuffix().empty()) {
-    Rect sufBounds(bounds.x,
-                   bounds.y,
-                   bounds.x2() - widget->childSpacing() - bounds.x,
-                   widget->textHeight());
-    IntersectClip clip(g, sufBounds & widget->clientChildrenBounds());
-    if (clip) {
-      drawText(g,
-               widget->getSuffix().c_str(),
-               colors.entrySuffix(),
-               ColorNone,
-               widget,
-               sufBounds,
-               widget->align(),
-               0);
+      g->drawTextWithDelegate(std::string(pos, textString.end()), // TODO use a string_view()
+                              colors.text(),
+                              ColorNone,
+                              gfx::Point(bounds.x, baselineAdjustment),
+                              &delegate);
     }
   }
 
   // Draw caret at the end of the text
   if (!delegate.caretDrawn()) {
+    bounds.x += delegate.textBounds().w;
+
     gfx::Rect charBounds(bounds.x + widget->bounds().x,
                          bounds.y + widget->bounds().y,
                          0,

src/app/ui/slice_window.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019-2022  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2017  David Capello
 //
 // This program is distributed under the terms of
@@ -181,8 +181,7 @@ void SliceWindow::onPivotChange()
 void SliceWindow::onToggleUserData()
 {
   m_userDataView.toggleVisibility();
-  remapWindow();
-  manager()->invalidate();
+  expandWindow(gfx::Size(bounds().w, sizeHint().h));
 }
 
 void SliceWindow::onModifyField(ui::Entry* entry, const Mods mods)

src/app/ui/tabs.cpp

@@ -11,6 +11,7 @@
 
 #include "app/ui/tabs.h"
 
+#include "app/color_spaces.h"
 #include "app/color_utils.h"
 #include "app/modules/gfx.h"
 #include "app/modules/gui.h"
@@ -969,7 +970,8 @@ void Tabs::createFloatingUILayer(Tab* tab)
   ASSERT(!m_floatingUILayer);
 
   ui::Display* display = this->display();
-  os::SurfaceRef surface = os::System::instance()->makeRgbaSurface(tab->width, m_tabsHeight);
+  os::SurfaceRef surface =
+    os::System::instance()->makeRgbaSurface(tab->width, m_tabsHeight, get_current_color_space());
 
   // Fill the surface with pink color
   {

src/app/ui/tag_window.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019-2022  Igara Studio S.A.
+// Copyright (C) 2019-2025  Igara Studio S.A.
 // Copyright (C) 2001-2016  David Capello
 //
 // This program is distributed under the terms of
@@ -132,8 +132,7 @@ void TagWindow::onRepeatChange()
 void TagWindow::onToggleUserData()
 {
   m_userDataView.toggleVisibility();
-  remapWindow();
-  manager()->invalidate();
+  expandWindow(gfx::Size(bounds().w, sizeHint().h));
 }
 
 } // namespace app

src/app/ui/timeline/timeline.cpp

@@ -4321,6 +4321,12 @@ void Timeline::clearAndInvalidateRange()
   }
 }
 
+void Timeline::refresh()
+{
+  regenerateRows();
+  invalidate();
+}
+
 app::gen::GlobalPref::Timeline& Timeline::timelinePref() const
 {
   return Preferences::instance().timeline;
@@ -4545,7 +4551,7 @@ void Timeline::onDrag(ui::DragEvent& e)
   m_range.clearRange();
   setHot(hitTest(nullptr, e.position()));
   switch (m_hot.part) {
-    case PART_NOTHING:             invalidate();
+    case PART_NOTHING:             invalidate(); [[fallthrough]];
     case PART_ROW:
     case PART_ROW_EYE_ICON:
     case PART_ROW_CONTINUOUS_ICON:
@@ -4576,7 +4582,7 @@ void Timeline::onDrop(ui::DragEvent& e)
 
   // Determine at which frame and layer the content was dropped on.
   frame_t frame = m_frame;
-  layer_t layerIndex = getLayerIndex(m_layer);
+  layer_t layerIndex = m_sprite->root()->getLayerIndex(m_layer);
   InsertionPoint insert = InsertionPoint::BeforeLayer;
   DroppedOn droppedOn = DroppedOn::Unspecified;
   TRACE("m_dropRange.type() %d\n", m_dropRange.type());
@@ -4602,7 +4608,7 @@ void Timeline::onDrop(ui::DragEvent& e)
       break;
     case Range::kLayers:
       droppedOn = DroppedOn::Layer;
-      if (m_dropTarget.vhit != DropTarget::VeryBottom) {
+      if (m_dropTarget.vhit != DropTarget::VeryBottom && !m_dropRange.selectedLayers().empty()) {
         auto* selectedLayer = *m_dropRange.selectedLayers().begin();
         layerIndex = getLayerIndex(selectedLayer);
       }

src/app/ui/timeline/timeline.h

@@ -155,6 +155,8 @@ public:
 
   void clearAndInvalidateRange();
 
+  void refresh();
+
 protected:
   bool onProcessMessage(ui::Message* msg) override;
   void onInitTheme(ui::InitThemeEvent& ev) override;

src/app/util/clipboard.cpp

@@ -10,6 +10,7 @@
 #endif
 
 #include "app/app.h"
+#include "app/cmd/add_slice.h"
 #include "app/cmd/clear_mask.h"
 #include "app/cmd/deselect_mask.h"
 #include "app/cmd/set_mask.h"
@@ -20,6 +21,7 @@
 #include "app/doc_api.h"
 #include "app/doc_range.h"
 #include "app/doc_range_ops.h"
+#include "app/i18n/strings.h"
 #include "app/modules/gfx.h"
 #include "app/modules/gui.h"
 #include "app/pref/preferences.h"
@@ -32,6 +34,7 @@
 #include "app/util/cel_ops.h"
 #include "app/util/clipboard.h"
 #include "app/util/new_image_from_mask.h"
+#include "app/util/slice_utils.h"
 #include "clip/clip.h"
 #include "doc/algorithm/shrink_bounds.h"
 #include "doc/blend_image.h"
@@ -114,6 +117,9 @@ struct Clipboard::Data {
   // Selected set of layers/layers/cels
   ClipboardRange range;
 
+  // Selected slices
+  std::vector<Slice> slices;
+
   Data() { range.observeUIContext(); }
 
   ~Data()
@@ -132,6 +138,7 @@ struct Clipboard::Data {
     picks.clear();
     mask.reset();
     range.invalidate();
+    slices.clear();
   }
 
   ClipboardFormat format() const
@@ -146,6 +153,8 @@ struct Clipboard::Data {
       return ClipboardFormat::PaletteEntries;
     else if (tileset && picks.picks())
       return ClipboardFormat::Tileset;
+    else if (!slices.empty())
+      return ClipboardFormat::Slices;
     else
       return ClipboardFormat::None;
   }
@@ -212,6 +221,7 @@ void Clipboard::setData(Image* image,
                         Mask* mask,
                         Palette* palette,
                         Tileset* tileset,
+                        const std::vector<Slice*>* slices,
                         bool set_native_clipboard,
                         bool image_source_is_transparent)
 {
@@ -226,6 +236,11 @@ void Clipboard::setData(Image* image,
   else
     m_data->image.reset(image);
 
+  if (slices) {
+    for (auto* slice : *slices)
+      m_data->slices.push_back(*slice);
+  }
+
   if (set_native_clipboard && use_native_clipboard()) {
     // Copy tilemap to the native clipboard
     if (isTilemap) {
@@ -262,6 +277,7 @@ bool Clipboard::copyFromDocument(const Site& site, bool merged)
             (mask ? new Mask(*mask) : nullptr),
             (pal ? new Palette(*pal) : nullptr),
             Tileset::MakeCopyCopyingImages(ts),
+            nullptr,
             true, // set native clipboard
             site.layer() && !site.layer()->isBackground());
 
@@ -277,6 +293,7 @@ bool Clipboard::copyFromDocument(const Site& site, bool merged)
           (mask ? new Mask(*mask) : nullptr),
           (pal ? new Palette(*pal) : nullptr),
           nullptr,
+          nullptr,
           true, // set native clipboard
           site.layer() && !site.layer()->isBackground());
 
@@ -401,6 +418,7 @@ void Clipboard::copyImage(const Image* image, const Mask* mask, const Palette* p
           (mask ? new Mask(*mask) : nullptr),
           (pal ? new Palette(*pal) : nullptr),
           nullptr,
+          nullptr,
           App::instance()->isGui(),
           false);
 }
@@ -415,6 +433,7 @@ void Clipboard::copyTilemap(const Image* image,
           (mask ? new Mask(*mask) : nullptr),
           (pal ? new Palette(*pal) : nullptr),
           Tileset::MakeCopyCopyingImages(tileset),
+          nullptr,
           true,
           false);
 }
@@ -428,6 +447,7 @@ void Clipboard::copyPalette(const Palette* palette, const PalettePicks& picks)
           nullptr,
           new Palette(*palette),
           nullptr,
+          nullptr,
           false, // Don't touch the native clipboard now
           false);
 
@@ -438,6 +458,20 @@ void Clipboard::copyPalette(const Palette* palette, const PalettePicks& picks)
   m_data->picks = picks;
 }
 
+void Clipboard::copySlices(const std::vector<Slice*> slices)
+{
+  if (slices.empty())
+    return;
+
+  setData(nullptr,
+          nullptr,
+          nullptr,
+          nullptr,
+          &slices,
+          false, // Don't touch the native clipboard now
+          false);
+}
+
 void Clipboard::paste(Context* ctx, const bool interactive, const gfx::Point* position)
 {
   const Site site = ctx->activeSite();
@@ -782,6 +816,26 @@ void Clipboard::paste(Context* ctx, const bool interactive, const gfx::Point* po
       }
       break;
     }
+
+    case ClipboardFormat::Slices: {
+      auto& slices = m_data->slices;
+
+      if (slices.empty())
+        return;
+
+      ContextWriter writer(ctx);
+      Tx tx(writer, "Paste Slices");
+      editor->clearSlicesSelection();
+      for (auto& s : slices) {
+        Slice* slice = new Slice(s);
+        slice->setName(Strings::general_copy_of(slice->name()));
+        tx(new cmd::AddSlice(dstSpr, slice));
+        editor->selectSlice(slice);
+      }
+      tx.commit();
+      updateDstDoc = true;
+      break;
+    }
   }
 
   // Update all editors/views showing this document
@@ -799,7 +853,7 @@ ImageRef Clipboard::getImage(Palette* palette)
     Tileset* native_tileset = nullptr;
     getNativeBitmap(&native_image, &native_mask, &native_palette, &native_tileset);
     if (native_image) {
-      setData(native_image, native_mask, native_palette, native_tileset, false, false);
+      setData(native_image, native_mask, native_palette, native_tileset, nullptr, false, false);
     }
   }
   if (m_data->palette && palette)

src/app/util/clipboard.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
@@ -23,6 +23,7 @@ class Image;
 class Mask;
 class Palette;
 class PalettePicks;
+class Slice;
 class Tileset;
 } // namespace doc
 
@@ -45,6 +46,7 @@ enum class ClipboardFormat {
   PaletteEntries,
   Tilemap,
   Tileset,
+  Slices,
 };
 
 class Clipboard : public ui::ClipboardDelegate {
@@ -74,6 +76,7 @@ public:
                    const doc::Palette* pal,
                    const doc::Tileset* tileset);
   void copyPalette(const doc::Palette* palette, const doc::PalettePicks& picks);
+  void copySlices(const std::vector<doc::Slice*> slices);
   void paste(Context* ctx, const bool interactive, const gfx::Point* position = nullptr);
 
   doc::ImageRef getImage(doc::Palette* palette);
@@ -106,6 +109,7 @@ private:
                doc::Mask* mask,
                doc::Palette* palette,
                doc::Tileset* tileset,
+               const std::vector<doc::Slice*>* slices,
                bool set_native_clipboard,
                bool image_source_is_transparent);
   bool copyFromDocument(const Site& site, bool merged = false);