Merge branch 'master' into fix-image-dirty-state-on-close

Author: ericksson

.github/workflows/build.yml

@@ -5,6 +5,8 @@ on:
   push:
     paths-ignore:
       - '**.md'
+      - '**.po'
+      - '**.pot'
   pull_request:
   schedule:
     # Run every week just to make sure the CI environment still works.

CHANGELOG.md

@@ -1,38 +1,87 @@
 # Change Log
 All notable changes to this project (beginning with version 1.7) will be documented in this file.
 
-## [Unreleased](https://github.com/PintaProject/Pinta/compare/3.0...HEAD)
+## [Unreleased](https://github.com/PintaProject/Pinta/compare/3.0.3...HEAD)
 
 Thanks to the following contributors who worked on this release:
 - @cameronwhite
 - @badcel
+- @ericksson
 - @JGCarroll
 - @Lehonti
 - @UrtsiSantsi
 - @pedropaulosuzuki
+- @bplaat
 
 ### Added
+- Implemented a new axonometric grid (View > Canvas Grid... > Show Axonometric Grid) (#1438, #1541)
 - Rewrote the canvas widget to improve performance and memory usage issues for zoomed-in images (#1020, #1485)
-- Added an option (View -> Show/Hide -> Menu Bar) to switch to a menu bar layout instead of a header bar (#781, #1418)
+- Added a new Cells effect (#1589)
 - The "About" dialog now includes links to the issue tracker and discussion forum (#1343)
 - When compiling Pinta, the GirCoreSource MSBuild property can be set to easily build Pinta against a local build of gir.core for easy debugging (#1403)
-- Pinta now configures a compatibility version number for add-ins, to support running add-ins built against older versions such as Pinta 3.0 (#1379, #1389)
 - Keyboard shortcuts are now displayed on all toolbar button tooltips (#1408, #1432)
+- Added a right click menu for layers, containing actions that can be applied to the selected layer (#1588)
+- The Dithering effect can now use Pinta's current palette in addition to the effect's preset color palettes (#1594)
+- Random seed values for effects can now be directly controlled, in addition to use the Reseed button (#1592, #1591)
+- Support for color picking in `SimpleEffectDialog`. Useful for add-in developers (#1611)
 
 ### Changed
 - Updated dependencies to require GTK 4.18+ and libadwaita 1.7+
-- Improved the sizing of the toolbox icons, particularly for high DPI displays (#1374)
-- The text tool now uses the system's default font rather than being hardcoded to Arial, which may not exist on some systems (#1422, #1421)
 - Removed use of deprecated Gtk.FontButton (#1421)
 - View menu moved from hamburger menu to dedicated button (#1428, #1471)
+- Updated the application icon on macOS to better match the platform's icon style guidelines (#1572)
 
 ### Fixed
-- Fixed an issue where the toolbar's height could change when switching tools (#1370, #1391) 
 - Fixed a bug where cancelling the color picker dialog could still update the palette colors (#1390, #1411)
-- The text tool's "Normal and Outline" mode now draws the outline behind the text to avoid obscuring it (#1423, #1426) 
+- The text tool's "Normal and Outline" mode now draws the outline behind the text to avoid obscuring it (#1423, #1426)
 - Improved the handling of negative angle values in the Rotate / Zoom Layer dialog (#1142, #1440)
-- Fixed potential crashes when adjusting the brush width (#1340)
+- Fixed incorrect behavior with transparent colors in the Gradient tool (#1552, #1543)
+- Fixed issues where the layer widget did not show the correct selected layer when switching documents (#1602, #1573)
+- Fixed toolbar layout issues with displaying the cursor position and selection size (#1429, #1540)
+
+## [3.0.3](https://github.com/PintaProject/Pinta/release/tag/3.0.3) - 2025/08/01
+
+Thanks to the following contributors who worked on this release:
+- @cameronwhite
+- @ericksson
+- @Lehonti
+
+### Fixed
+- Fixed a packaging issue for the macOS arm64 build which caused many icons to disappear (#1605)
+- Fixed an issue where hiding a panel did not cause other panels to expand into the available space (#1472, #1500)
 - Fixed incorrect behavior of the Atkinson method in the Dithering effect (#1489)
+
+## [3.0.2](https://github.com/PintaProject/Pinta/releases/tag/3.0.2) - 2025/07/06
+
+Thanks to the following contributors who worked on this release:
+- @cameronwhite
+
+### Fixed
+- Fixed an error when loading the add-in repositories (#1547, #1542)
+- Fixed a bug in the Levels dialog where the Red and Blue toggles were reversed (#1551)
+- The Vulkan DLL is now bundled with the Windows installer, which fixes errors on startup for certain systems (#1497, #1530)
+- Fixed performance issues when opening a large number of files (#1574, #1578)
+
+## [3.0.1](https://github.com/PintaProject/Pinta/releases/tag/3.0.1) - 2025/06/07
+
+Thanks to the following contributors who worked on this release:
+- @cameronwhite
+- @JGCarroll
+- @Lehonti
+- @UrtsiSantsi
+
+### Added
+- Added an option (View -> Show/Hide -> Menu Bar) to switch to a menu bar layout instead of a header bar (#781, #1418)
+- Pinta now configures a compatibility version number for add-ins, to support running add-ins built against older versions such as Pinta 3.0 (#1379, #1389)
+
+### Changed
+- Improved the sizing of the toolbox icons, particularly for high DPI displays (#1374)
+- The text tool now uses the system's default font rather than being hardcoded to Arial, which may not exist on some systems (#1422, #1421)
+- Updated translations
+
+### Fixed
+- Fixed an issue where the toolbar's height could change when switching tools (#1370, #1391)
+- Fixed potential crashes when adjusting the brush width (#1340)
 - Fixed a bug on Windows where Pinta did not use the system's language for translations (#1473, #1493)
 
 ## [3.0](https://github.com/PintaProject/Pinta/releases/tag/3.0) - 2025/04/11

Directory.Packages.props

@@ -14,16 +14,16 @@
     <PackageVersion Include="Mono.Addins.CecilReflector" Version="1.4.2-alpha.4" />
     <PackageVersion Include="NGettext" Version="0.6.7" />
     <PackageVersion Include="ParagonClipper" Version="6.4.2" />
-    <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
+    <PackageVersion Include="System.CommandLine" Version="2.0.0-beta6.25358.103" />
     <PackageVersion Include="Tmds.DBus" Version="0.21.2" />
 
     <!-- Dependencies used for unit tests -->
-    <PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
+    <PackageVersion Include="BenchmarkDotNet" Version="0.15.2" />
     <PackageVersion Include="NUnit" Version="4.3.2" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
     <PackageVersion Include="NUnit3TestAdapter" Version="5.0.0" />
 
     <!-- To resolve dependency conflict with GirCore.GObject-2.0.Integration and BenchmarkDotNet -->
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
   </ItemGroup>
 </Project>

Pinta.Core/Actions/FileActions.cs

@@ -25,6 +25,8 @@
 // THE SOFTWARE.
 
 using System;
+using System.Linq;
+using System.Threading.Tasks;
 
 namespace Pinta.Core;
 
@@ -39,7 +41,14 @@ public sealed class FileActions
 	public Command Print { get; }
 
 	public event EventHandler<ModifyCompressionEventArgs>? ModifyCompression;
-	public event EventHandler<DocumentCancelEventArgs>? SaveDocument;
+
+	/// <remarks>
+	/// The returned value is
+	/// <see langword="true" /> if was save succeeded
+	/// and
+	/// <see langword="false" /> otherwise
+	/// </remarks>
+	public event AsyncEventHandler<FileActions, DocumentSaveEventArgs>.Returning<bool>? SaveDocument;
 
 	private readonly SystemManager system;
 	private readonly AppActions app;
@@ -136,14 +145,18 @@ public void RegisterActions (Gtk.Application application, Gio.Menu menu)
 
 	public void RegisterHandlers () { }
 
-	internal bool RaiseSaveDocument (Document document, bool saveAs)
+	/// <returns>
+	/// <see langword="true"/> if the save succeeded,
+	/// <see langword="false"/> otherwise (for example, if it was canceled)
+	/// </returns>
+	internal async Task<bool> RaiseSaveDocument (Document document, bool saveAs)
 	{
-		if (SaveDocument == null)
+		if (SaveDocument is null)
 			throw new InvalidOperationException ("GUI is not handling Workspace.SaveDocument");
 
-		DocumentCancelEventArgs e = new (document, saveAs);
-		SaveDocument (this, e);
-		return !e.Cancel;
+		DocumentSaveEventArgs e = new (document, saveAs);
+		var results = await SaveDocument.InvokeSequential (this, e);
+		return results.All (succeeded => succeeded);
 	}
 
 	internal int RaiseModifyCompression (int defaultCompression, Gtk.Window parent)

Pinta.Core/Actions/LayerActions.cs

@@ -224,7 +224,7 @@ private Gtk.FileFilter CreateImagesFileFilter ()
 	{
 		Gtk.FileFilter imagesFilter = Gtk.FileFilter.New ();
 		foreach (var format in image_formats.Formats) {
-			if (format.IsWriteOnly ()) continue;
+			if (!format.IsImportAvailable ()) continue;
 			foreach (string ext in format.Extensions)
 				imagesFilter.AddPattern ($"*.{ext}");
 		}

Pinta.Core/Actions/ViewActions.cs

@@ -283,7 +283,6 @@ public void RegisterActions (Gtk.Application app, Gio.Menu menu)
 
 	public void CreateStatusBar (Gtk.Box statusbar)
 	{
-		statusbar.Append (GtkExtensions.CreateToolBarSeparator ());
 		statusbar.Append (ZoomOut.CreateToolBarItem ());
 		statusbar.Append (ZoomComboBox);
 		statusbar.Append (ZoomIn.CreateToolBarItem ());

Pinta.Core/Actions/WindowActions.cs

@@ -31,16 +31,13 @@ public sealed class WindowActions
 	private Gio.Menu doc_section = null!; // NRT - Set in RegisterActions
 	private static readonly string doc_action_id = "active_document";
 	private readonly Gio.SimpleAction active_doc_action;
+	private uint deferred_update_event;
 
 	public Command SaveAll { get; }
 	public Command CloseAll { get; }
 
-	private readonly ChromeManager chrome;
 	private readonly WorkspaceManager workspace;
-	public WindowActions (
-		ChromeManager chrome,
-		ToolManager tools,
-		WorkspaceManager workspace)
+	public WindowActions (WorkspaceManager workspace)
 	{
 		SaveAll = new Command (
 			"SaveAll",
@@ -63,16 +60,8 @@ public WindowActions (
 			GLib.Variant.NewInt32 (-1));
 
 		active_doc_action.OnActivate += (o, e) => {
-
-			var idx = e.Parameter!.GetInt32 ();
-
-			if (idx >= workspace.OpenDocuments.Count)
-				return;
-
-			workspace.SetActiveDocumentInternal (
-				tools,
-				workspace.OpenDocuments[idx]);
-
+			int idx = e.Parameter!.GetInt32 ();
+			workspace.SetActiveDocument (idx);
 			active_doc_action.ChangeState (e.Parameter);
 		};
 
@@ -81,9 +70,10 @@ public WindowActions (
 			e.Document.IsDirtyChanged += (_, _) => RebuildDocumentMenu ();
 			AddDocumentMenuItem (workspace.OpenDocuments.IndexOf (e.Document));
 		};
+
+		workspace.ActiveDocumentChanged += OnActiveDocumentChanged;
 		workspace.DocumentClosed += (_, _) => RebuildDocumentMenu ();
 
-		this.chrome = chrome;
 		this.workspace = workspace;
 	}
 
@@ -102,28 +92,24 @@ public void RegisterActions (
 			CloseAll]);
 
 		app.AddAction (active_doc_action);
-	}
 
-	public void SetActiveDocument (Document doc)
-	{
-		int idx = workspace.OpenDocuments.IndexOf (doc);
-		active_doc_action.Activate (GLib.Variant.NewInt32 (idx));
+		// Assign accelerators up to Alt-9 for the active documents.
+		for (int i = 0; i < 9; ++i)
+			app.SetAccelsForAction (BuildActionId (i), [$"<Alt>{i + 1}"]);
 	}
 
 	private void AddDocumentMenuItem (int idx)
 	{
 		Document doc = workspace.OpenDocuments[idx];
-		string action_id = $"app.{doc_action_id}({idx})";
-		string label = $"{doc.DisplayName}{(doc.IsDirty ? '*' : string.Empty)}";
-		Gio.MenuItem menu_item = Gio.MenuItem.New (label, action_id);
-
-		doc_section.AppendItem (menu_item);
+		string actionId = BuildActionId (idx);
+		string label = $"{doc.DisplayName}{(doc.IsDirty ? "*" : string.Empty)}";
 
-		// We only assign accelerators up to Alt-9
-		if (idx < 9)
-			chrome.Application.SetAccelsForAction (action_id, [$"<Alt>{idx + 1}"]);
+		Gio.MenuItem menuItem = Gio.MenuItem.New (label, actionId);
+		doc_section.AppendItem (menuItem);
 	}
 
+	private static string BuildActionId (int idx) => $"app.{doc_action_id}({idx})";
+
 	private void RebuildDocumentMenu ()
 	{
 		doc_section.RemoveAll ();
@@ -133,4 +119,18 @@ private void RebuildDocumentMenu ()
 
 		workspace.ResetTitle ();
 	}
+
+	private void OnActiveDocumentChanged (object? o, System.EventArgs eventArgs)
+	{
+		// Updating the action's state can be surprisingly expensive when e.g. opening
+		// many documents (bug #1574), so an update is deferred until we return to the event loop.
+		if (deferred_update_event > 0)
+			return;
+
+		deferred_update_event = GLib.Functions.IdleAdd (GLib.Constants.PRIORITY_DEFAULT, () => {
+			active_doc_action.ChangeState (GLib.Variant.NewInt32 (workspace.ActiveDocumentIndex));
+			deferred_update_event = 0;
+			return false;
+		});
+	}
 }

Pinta.Core/Algorithms/Mathematics.cs

@@ -27,6 +27,14 @@ public static TNumber Magnitude<TNumber> (TNumber x, TNumber y) where TNumber :
 	public static TNumber MagnitudeSquared<TNumber> (TNumber x, TNumber y) where TNumber : INumber<TNumber>
 		=> x * x + y * y;
 
+	/// <summary>
+	/// Linear interpolation for byte values, where the blend factor is from 0-255.
+	/// </summary>
+	public static byte LerpByte (byte from, byte to, byte frac)
+	{
+		return (byte) (from + ((to - from) * frac) / 255);
+	}
+
 	/// <summary>Linear interpolation</summary>
 	public static TNumber Lerp<TNumber> (
 		TNumber from,

Pinta.Core/Algorithms/Sampling.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Immutable;
+
+namespace Pinta.Core;
+
+public static class Sampling
+{
+	/// <returns>
+	/// Offsets, from top left corner of points,
+	/// where samples should be taken.
+	/// </returns>
+	public static ImmutableArray<PointD> CreateSamplingOffsets (int quality)
+	{
+		if (quality < 1)
+			throw new ArgumentOutOfRangeException (nameof (quality));
+
+		var builder = ImmutableArray.CreateBuilder<PointD> ();
+		builder.Capacity = quality * quality;
+		double sectionSize = 1.0 / quality;
+		double initial = sectionSize / 2;
+
+		for (int h = 0; h < quality; h++) {
+			for (int v = 0; v < quality; v++) {
+				double hOffset = sectionSize * h;
+				double vOffset = sectionSize * v;
+				PointD currentPoint = new (
+					X: initial + hOffset,
+					Y: initial + vOffset);
+				builder.Add (currentPoint);
+			}
+		}
+
+		return builder.MoveToImmutable ();
+	}
+}