From 26d449d6f54547a7da276106c857d8f4f7d84f24 Mon Sep 17 00:00:00 2001
From: Lehonti Ramos <17771375+Lehonti@users.noreply.github.com>
Date: Mon, 18 Dec 2023 17:26:44 +0100
Subject: [PATCH] Used compound assignments when appropriate (#618)

* Used compound assignments when appropriate

* In `CairoExtensions`, swapped values using tuples
---
 Pinta.Core/Actions/ViewActions.cs        |  2 +-
 Pinta.Core/Extensions/CairoExtensions.cs | 16 +++++-----------
 Pinta.Effects/Effects/BulgeEffect.cs     |  4 ++--
 Pinta.Tools/Brushes/CircleBrush.cs       |  3 +++
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/Pinta.Core/Actions/ViewActions.cs b/Pinta.Core/Actions/ViewActions.cs
index 29600e025..c359cb26b 100644
--- a/Pinta.Core/Actions/ViewActions.cs
+++ b/Pinta.Core/Actions/ViewActions.cs
@@ -314,7 +314,7 @@ public void UpdateCanvasScale ()
 			return;
 
 		percent = Math.Min (percent, 3600);
-		percent = percent / 100.0;
+		percent /= 100.0;
 
 		PintaCore.Workspace.Scale = percent;
 	}
diff --git a/Pinta.Core/Extensions/CairoExtensions.cs b/Pinta.Core/Extensions/CairoExtensions.cs
index 454ffa178..38a14dbea 100644
--- a/Pinta.Core/Extensions/CairoExtensions.cs
+++ b/Pinta.Core/Extensions/CairoExtensions.cs
@@ -657,13 +657,13 @@ public static ColorBgra GetBilinearSampleWrapped (this ImageSurface src, ReadOnl
 				if (sx < 0)
 					sx = (srcWidth - 1) + ((sx + 1) % srcWidth);
 				else if (sx > (srcWidth - 1))
-					sx = sx % srcWidth;
+					sx %= srcWidth;
 
 				int sy = iv;
 				if (sy < 0)
 					sy = (srcHeight - 1) + ((sy + 1) % srcHeight);
 				else if (sy > (srcHeight - 1))
-					sy = sy % srcHeight;
+					sy %= srcHeight;
 
 				int sleft = sx;
 				int sright;
@@ -727,9 +727,7 @@ public static ImmutableArray<Scanline> GetScans (this ReadOnlySpan<PointI> point
 				int dy;
 
 				if (top.Y > bottom.Y) {
-					PointI temp = top;
-					top = bottom;
-					bottom = temp;
+					(bottom, top) = (top, bottom);
 				}
 
 				dy = bottom.Y - top.Y;
@@ -750,9 +748,7 @@ public static ImmutableArray<Scanline> GetScans (this ReadOnlySpan<PointI> point
 						min = j;
 
 				if (min != i) {
-					Edge temp = edgeTable[min];
-					edgeTable[min] = edgeTable[i];
-					edgeTable[i] = temp;
+					(edgeTable[i], edgeTable[min]) = (edgeTable[min], edgeTable[i]);
 				}
 			}
 
@@ -824,9 +820,7 @@ public static ImmutableArray<Scanline> GetScans (this ReadOnlySpan<PointI> point
 							min = j;
 
 					if (min != i) {
-						int temp = active[min];
-						active[min] = active[i];
-						active[i] = temp;
+						(active[i], active[min]) = (active[min], active[i]);
 					}
 				}
 
diff --git a/Pinta.Effects/Effects/BulgeEffect.cs b/Pinta.Effects/Effects/BulgeEffect.cs
index dd4618880..a9c2a21d7 100644
--- a/Pinta.Effects/Effects/BulgeEffect.cs
+++ b/Pinta.Effects/Effects/BulgeEffect.cs
@@ -48,8 +48,8 @@ public override void Render (ImageSurface src, ImageSurface dst, ReadOnlySpan<Re
 		float maxrad = Math.Min (hw, hh);
 		float amt = bulge / 100f;
 
-		hh = hh + (float) Data.Offset.Y * hh;
-		hw = hw + (float) Data.Offset.X * hw;
+		hh += (float) Data.Offset.Y * hh;
+		hw += (float) Data.Offset.X * hw;
 
 		int src_width = src.Width;
 		int src_height = src.Height;
diff --git a/Pinta.Tools/Brushes/CircleBrush.cs b/Pinta.Tools/Brushes/CircleBrush.cs
index c12444f6d..d0c475f3a 100644
--- a/Pinta.Tools/Brushes/CircleBrush.cs
+++ b/Pinta.Tools/Brushes/CircleBrush.cs
@@ -43,13 +43,16 @@ protected override RectangleI OnMouseMove (
 		BrushStrokeArgs strokeArgs)
 	{
 		PointI mouseDelta = strokeArgs.CurrentPosition - strokeArgs.LastPosition;
+
 		PointD center = new (
 			X: Math.Floor (strokeArgs.CurrentPosition.X / 100.0) * 100 + 50,
 			Y: Math.Floor (strokeArgs.CurrentPosition.Y / 100.0) * 100 + 50
 		);
+
 		double d = mouseDelta.Magnitude () * 2.0;
 		int steps = Random.Next (1, 10);
 		double step_delta = d / steps;
+
 		for (int i = 0; i < steps; i++) {
 			var radius = (steps - i) * step_delta;
 			g.Arc (center.X, center.Y, radius, 0, Math.PI * 2);