Update to the latest GtkSharp version

This fixes the crashes with Gdk.DefaultSeat and lets us move away from the deprecated API for accessing the mouse position.
dystudio · Mar 8, 2021 · e7fc021 · e7fc021
1 parent c515977
commit e7fc021
Show file tree

Hide file tree

Showing 13 changed files with 35 additions and 38 deletions.
diff --git a/Pinta.Core/Extensions/GdkExtensions.cs b/Pinta.Core/Extensions/GdkExtensions.cs
@@ -269,5 +269,17 @@ public static Key ToUpper (this Key k1)
 
 			return k1;
 		}
+
+		public static void GetWidgetPointer (Gtk.Widget widget, out int x, out int y, out Gdk.ModifierType mask)
+		{
+			var pointer = widget.Display.DefaultSeat.Pointer;
+			widget.Window.GetDevicePosition (pointer, out x, out y, out mask);
+		}
+
+		public static void GetWindowPointer (Gdk.Window window, out int x, out int y, out Gdk.ModifierType mask)
+		{
+			var pointer = window.Display.DefaultSeat.Pointer;
+			window.GetDevicePosition (pointer, out x, out y, out mask);
+		}
 	}
 }
diff --git a/Pinta.Core/Extensions/ObsoleteExtensions.cs b/Pinta.Core/Extensions/ObsoleteExtensions.cs
@@ -22,13 +22,6 @@ public static void AddToIconFactory (IconFactory factory, string stock_id, IconS
 		public static void AddDefaultToIconFactory (IconFactory factory)
 			=> factory.AddDefault ();
 
-		// https://github.com/GtkSharp/GtkSharp/issues/131
-		public static Gdk.Window GetWindowPointer (Gdk.Window window, out int x, out int y, out ModifierType mask)
-			=> window.GetPointer (out x, out y, out mask);
-
-		public static void GetWidgetPointer (Widget widget, out int x, out int y)
-			=> widget.GetPointer (out x, out y);
-
 		public static FontDescription GetStyleContextFont (StyleContext context, StateFlags flags)
 			=> context.GetFont (flags);
 	}

diff --git a/Pinta.Core/Pinta.Core.csproj b/Pinta.Core/Pinta.Core.csproj
@@ -12,7 +12,7 @@
     <Product />
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="GtkSharp" Version="3.22.25.128" />
+    <PackageReference Include="GtkSharp" Version="3.24.24.4" />
     <PackageReference Include="NGettext" Version="0.6.6" />
     <PackageReference Include="SharpZipLib" Version="1.3.1" />
     <PackageReference Include="ParagonClipper" Version="6.4.2" />

diff --git a/Pinta.Docking/Pinta.Docking.csproj b/Pinta.Docking/Pinta.Docking.csproj
@@ -12,6 +12,6 @@
     <Product />
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="GtkSharp" Version="3.22.25.128" />
+    <PackageReference Include="GtkSharp" Version="3.24.24.4" />
   </ItemGroup>
 </Project>
diff --git a/Pinta.Effects/Dialogs/Effects.CurvesDialog.cs b/Pinta.Effects/Dialogs/Effects.CurvesDialog.cs
@@ -200,7 +200,7 @@ private void HandleDrawingMotionNotifyEvent (object o, Gtk.MotionNotifyEventArgs
 		{	
 			int x, y;
 			Gdk.ModifierType mask;
-			ObsoleteExtensions.GetWindowPointer (drawing.Window, out x, out y, out mask); 			
+			GdkExtensions.GetWindowPointer (drawing.Window, out x, out y, out mask); 			
 
 			if (x < 0 || x >= size || y < 0 || y >=size)
 				return;
@@ -224,7 +224,7 @@ private void HandleDrawingButtonPressEvent (object o, Gtk.ButtonPressEventArgs a
 		{
 			int x, y;
 			Gdk.ModifierType mask;
-			ObsoleteExtensions.GetWindowPointer (drawing.Window, out x, out y, out mask); 
+			GdkExtensions.GetWindowPointer (drawing.Window, out x, out y, out mask); 
 
 			if (args.Event.Button == 1) {
 				AddControlPoint (x, y);
@@ -265,7 +265,7 @@ private void DrawPointerCross (Context g)
 		{
 			int x, y;
 			Gdk.ModifierType mask;
-			ObsoleteExtensions.GetWindowPointer (drawing.Window, out x, out y, out mask); 
+			GdkExtensions.GetWindowPointer (drawing.Window, out x, out y, out mask); 
 
 			if (x >= 0 && x < size && y >= 0 && y < size) {
 				g.LineWidth = 0.5;
@@ -330,7 +330,7 @@ private void DrawControlPoints (Context g)
 		{
 			int x, y;
 			Gdk.ModifierType mask;
-			ObsoleteExtensions.GetWindowPointer (drawing.Window, out x, out y, out mask); 
+			GdkExtensions.GetWindowPointer (drawing.Window, out x, out y, out mask); 
 
 			var infos = GetDrawingInfos ();
 

diff --git a/Pinta.Effects/Pinta.Effects.csproj b/Pinta.Effects/Pinta.Effects.csproj
@@ -12,7 +12,7 @@
     <Product />
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="GtkSharp" Version="3.22.25.128" />
+    <PackageReference Include="GtkSharp" Version="3.24.24.4" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Pinta.Core\Pinta.Core.csproj" />

diff --git a/Pinta.Gui.Widgets/Pinta.Gui.Widgets.csproj b/Pinta.Gui.Widgets/Pinta.Gui.Widgets.csproj
@@ -12,7 +12,7 @@
     <Product />
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="GtkSharp" Version="3.22.25.128" />
+    <PackageReference Include="GtkSharp" Version="3.24.24.4" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Pinta.Core\Pinta.Core.csproj" />

diff --git a/Pinta.Gui.Widgets/Widgets/Canvas/CanvasWindow.cs b/Pinta.Gui.Widgets/Widgets/Canvas/CanvasWindow.cs
@@ -69,7 +69,7 @@ public bool IsMouseOnCanvas {
 			get {
 				// Get the position of the mouse pointer relative
 				// to canvas scrolled window top-left corner
-				ObsoleteExtensions.GetWidgetPointer (scrolled_window, out var x, out var y);
+				GdkExtensions.GetWidgetPointer (scrolled_window, out int x, out int y, out var mask);
 
 				// Check if the pointer is on the canvas
 				return (x > 0) && (x < scrolled_window.Allocation.Width) &&

diff --git a/Pinta.Gui.Widgets/Widgets/ColorGradientWidget.cs b/Pinta.Gui.Widgets/Widgets/ColorGradientWidget.cs
@@ -170,7 +170,7 @@ private int FindValueIndex (int y)
 
 		private void HandleMotionNotifyEvent (object o, MotionNotifyEventArgs args)
 		{
-			ObsoleteExtensions.GetWindowPointer (Window, out var px, out var py, out var mask);
+			GdkExtensions.GetWindowPointer (Window, out var px, out var py, out var mask);
 
 			var index = FindValueIndex (py);
 			py = (int) NormalizeY (index, py);
@@ -199,7 +199,7 @@ private void HandleLeaveNotifyEvent (object o, LeaveNotifyEventArgs args)
 
 		private void HandleButtonPressEvent (object o, ButtonPressEventArgs args)
 		{
-			ObsoleteExtensions.GetWindowPointer (Window, out var px, out var py, out var mask);
+			GdkExtensions.GetWindowPointer (Window, out var px, out var py, out var mask);
 
 			var index = FindValueIndex ((int) py);
 
@@ -227,7 +227,7 @@ private void DrawGradient (Context g)
 
 		private void DrawTriangles (Context g)
 		{
-			ObsoleteExtensions.GetWindowPointer (Window, out var px, out var py, out var mask);
+			GdkExtensions.GetWindowPointer (Window, out var px, out var py, out var mask);
 
 			var rect = GradientRectangle;
 			var all = Allocation.ToCairoRectangle ();

diff --git a/Pinta.Resources/Pinta.Resources.csproj b/Pinta.Resources/Pinta.Resources.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GtkSharp" Version="3.22.25.128" />
+    <PackageReference Include="GtkSharp" Version="3.24.24.4" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="icons/hicolor/16x16/*/*">

diff --git a/Pinta.Tools/Pinta.Tools.csproj b/Pinta.Tools/Pinta.Tools.csproj
@@ -12,7 +12,7 @@
     <Product />
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="GtkSharp" Version="3.22.25.128" />
+    <PackageReference Include="GtkSharp" Version="3.24.24.4" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Pinta.Core\Pinta.Core.csproj" />

diff --git a/Pinta/Pinta.csproj b/Pinta/Pinta.csproj
@@ -20,7 +20,7 @@
 
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="GtkSharp" Version="3.22.25.128" />
+    <PackageReference Include="GtkSharp" Version="3.24.24.4" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Pinta.Core\Pinta.Core.csproj" />
@@ -35,24 +35,16 @@
 
   <!-- Run msgfmt on our translation (po) files -->
   <ItemGroup>
-    <Translation Include="../po/*.po"/>
+    <Translation Include="../po/*.po" />
   </ItemGroup>
-  <Target Name="CompileTranslations"
-    BeforeTargets="Build"
-    Condition="'$(BuildTranslations)' == 'true'"
-  	Inputs="@(Translation)"
-  	Outputs="$(OutputPath)/locale/%(Translation.Filename)/LC_MESSAGES/pinta.mo">
+  <Target Name="CompileTranslations" BeforeTargets="Build" Condition="'$(BuildTranslations)' == 'true'" Inputs="@(Translation)" Outputs="$(OutputPath)/locale/%(Translation.Filename)/LC_MESSAGES/pinta.mo">
 
     <MakeDir Directories="$(OutputPath)/locale/%(Translation.Filename)/LC_MESSAGES" />
-    <Exec Command='msgfmt "%(Translation.FullPath)" -o "$(OutputPath)/locale/%(Translation.Filename)/LC_MESSAGES/pinta.mo"' />
+    <Exec Command="msgfmt &quot;%(Translation.FullPath)&quot; -o &quot;$(OutputPath)/locale/%(Translation.Filename)/LC_MESSAGES/pinta.mo&quot;" />
   </Target>
 
   <!-- Include the compiled translation files when publishing. -->
-  <Target Name="PublishTranslations"
-    AfterTargets="Publish"
-    Condition="'$(BuildTranslations)' == 'true'">
-    <Copy
-        SourceFiles="$(OutputPath)/locale/%(Translation.Filename)/LC_MESSAGES/pinta.mo"
-        DestinationFiles="$(PublishDir)/locale/%(Translation.Filename)/LC_MESSAGES/pinta.mo" />
+  <Target Name="PublishTranslations" AfterTargets="Publish" Condition="'$(BuildTranslations)' == 'true'">
+    <Copy SourceFiles="$(OutputPath)/locale/%(Translation.Filename)/LC_MESSAGES/pinta.mo" DestinationFiles="$(PublishDir)/locale/%(Translation.Filename)/LC_MESSAGES/pinta.mo" />
   </Target>
 </Project>
diff --git a/tests/Pinta.Core.Tests/Pinta.Core.Tests.csproj b/tests/Pinta.Core.Tests/Pinta.Core.Tests.csproj
@@ -12,9 +12,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GtkSharp" Version="3.22.25.128" />
-    <PackageReference Include="NUnit" Version="3.13.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
+    <PackageReference Include="GtkSharp" Version="3.24.24.4" />
+    <PackageReference Include="NUnit" Version="3.13.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
   </ItemGroup>