Port a couple more widgets to the new subclass init style.

Author: cameronwhite

Pinta.Gui.Widgets/Dialogs/SimpleEffectDialog.cs

@@ -338,12 +338,11 @@ private Gtk.Widget CreateCairoColorPicker (
 			? c
 			: Color.Black;
 
-		PintaColorButton colorButton = new () {
-			DisplayColor = currentColorCairo,
-			Hexpand = false,
-			Halign = Gtk.Align.Start,
-			WidthRequest = 80,
-		};
+		PintaColorButton colorButton = PintaColorButton.New ();
+		colorButton.DisplayColor = currentColorCairo;
+		colorButton.Hexpand = false;
+		colorButton.Halign = Gtk.Align.Start;
+		colorButton.WidthRequest = 80;
 
 		colorButton.OnClicked += async (_, _) => {
 

Pinta.Gui.Widgets/Widgets/Canvas/CanvasWindow.cs

@@ -94,15 +94,13 @@ public CanvasWindow (
 		scrolledWindow.Vexpand = true;
 		scrolledWindow.Child = viewPort;
 
-		Ruler horizontalRuler = new (Gtk.Orientation.Horizontal) {
-			Metric = MetricType.Pixels,
-			Visible = false,
-		};
+		Ruler horizontalRuler = Ruler.New (Gtk.Orientation.Horizontal);
+		horizontalRuler.Metric = MetricType.Pixels;
+		horizontalRuler.Visible = false;
 
-		Ruler verticalRuler = new (Gtk.Orientation.Vertical) {
-			Metric = MetricType.Pixels,
-			Visible = false,
-		};
+		Ruler verticalRuler = Ruler.New (Gtk.Orientation.Vertical);
+		verticalRuler.Metric = MetricType.Pixels;
+		verticalRuler.Visible = false;
 
 		Gtk.EventControllerMotion motionController = Gtk.EventControllerMotion.New ();
 		motionController.OnMotion += HandleMotion;

Pinta.Gui.Widgets/Widgets/PintaColorButton.cs

@@ -3,7 +3,8 @@
 
 namespace Pinta.Gui.Widgets;
 
-internal sealed class PintaColorButton : Gtk.Button
+[GObject.Subclass<Gtk.Button>]
+internal sealed partial class PintaColorButton
 {
 	private Color display_color = Color.Black;
 	public Color DisplayColor {
@@ -15,17 +16,18 @@ public Color DisplayColor {
 		}
 	}
 
-	private readonly Gtk.DrawingArea color_drawing_area;
-	internal PintaColorButton ()
+	private readonly Gtk.DrawingArea color_drawing_area = Gtk.DrawingArea.New ();
+
+	partial void Initialize ()
 	{
-		Gtk.DrawingArea colorDrawingArea = Gtk.DrawingArea.New ();
-		colorDrawingArea.Hexpand = true;
-		colorDrawingArea.Vexpand = true;
-		colorDrawingArea.SetDrawFunc (OnDraw);
-		SetChild (colorDrawingArea);
-		color_drawing_area = colorDrawingArea;
+		color_drawing_area.Hexpand = true;
+		color_drawing_area.Vexpand = true;
+		color_drawing_area.SetDrawFunc (OnDraw);
+		SetChild (color_drawing_area);
 	}
 
+	public static new PintaColorButton New () => NewWithProperties ([]);
+
 	private void OnDraw (
 		Gtk.DrawingArea drawingArea,
 		Context cr,

Pinta.Gui.Widgets/Widgets/Ruler.cs

@@ -44,7 +44,8 @@ public enum MetricType
 /// Replacement for Gtk.Ruler, which was removed in GTK3.
 /// Based on the original GTK2 widget and Inkscape's ruler widget.
 /// </summary>
-public sealed class Ruler : Gtk.DrawingArea
+[GObject.Subclass<Gtk.DrawingArea>]
+public sealed partial class Ruler
 {
 	private double position = 0;
 	private MetricType metric = MetricType.Pixels;
@@ -65,7 +66,7 @@ public NumberRange<double>? SelectionBounds {
 	/// <summary>
 	/// Whether the ruler is horizontal or vertical.
 	/// </summary>
-	public Gtk.Orientation Orientation { get; }
+	public Gtk.Orientation Orientation { get; private set; }
 
 	/// <summary>
 	/// Metric type used for the ruler.
@@ -101,11 +102,14 @@ public NumberRange<double> RulerRange {
 		}
 	}
 
-	public Ruler (Gtk.Orientation orientation)
+	partial void Initialize ()
 	{
-		Orientation = orientation;
-
 		SetDrawFunc ((area, context, width, height) => Draw (context, new Size (width, height)));
+	}
+
+	private void SetOrientation (Gtk.Orientation orientation)
+	{
+		Orientation = orientation;
 
 		// Determine the size request, based on the font size.
 		int font_size = GetFontSize (GetPangoContext ().GetFontDescription ()!, ScaleFactor);
@@ -126,6 +130,13 @@ public Ruler (Gtk.Orientation orientation)
 		HeightRequest = height;
 	}
 
+	public static Ruler New (Gtk.Orientation orientation)
+	{
+		Ruler ruler = NewWithProperties ([]);
+		ruler.SetOrientation (orientation);
+		return ruler;
+	}
+
 	// Invalidates cache _and_ queues redraw. Like a full refresh
 	private void QueueFullRedraw ()
 	{