From 03a91f8672b43056f4382e6173ae86d368b42894 Mon Sep 17 00:00:00 2001
From: Duncan Mak <duncan@mono-cvs.ximian.com>
Date: Fri, 9 Aug 2002 05:22:13 +0000
Subject: [PATCH] 2002-08-09  Duncan Mak  <duncan@ximian.com>

	* sample/Fifteen.cs (Position): Made it a property instead of a
	public field.

	* sample/pixmaps/gnome-color-browser.png: Icon for Fifteen#.

svn path=/trunk/gtk-sharp/; revision=6560
---
 ChangeLog                              |   7 +++++++
 sample/Fifteen.cs                      |  20 +++++++++++++++-----
 sample/pixmaps/gnome-color-browser.png | Bin 0 -> 2212 bytes
 3 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 sample/pixmaps/gnome-color-browser.png

diff --git a/ChangeLog b/ChangeLog
index 2e8540771..606c058bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-08-09  Duncan Mak  <duncan@ximian.com>
+
+	* sample/Fifteen.cs (Position): Made it a property instead of a
+	public field.
+
+	* sample/pixmaps/gnome-color-browser.png: Icon for Fifteen#.
+
 2002-08-09  Mike Kestner <mkestner@speakeasy.net>
 
 	* generator/SymbolTable.cs : make GLib.Value a manually_wrapped_type
diff --git a/sample/Fifteen.cs b/sample/Fifteen.cs
index b63a2688a..80ed44cbb 100644
--- a/sample/Fifteen.cs
+++ b/sample/Fifteen.cs
@@ -121,12 +121,13 @@ public class Fifteen
 
 		string [] documenters = new string [] {};
 		string translaters = null;
+		Pixbuf pixbuf = new Pixbuf ("pixmaps/gnome-color-browser.png");
 
 		Gnome.About about = new Gnome.About ("Fifteen #", "0.1",
 						     "Copyright (C) 2002, Ximian Inc.",
 						     "A C# port of Fifteen, a gnomecanvas demo",
 						     authors, documenters, translaters,
-						     new Gdk.Pixbuf ());
+						     pixbuf);
 		about.Show ();
 	}
 
@@ -179,7 +180,7 @@ public class BoardPiece : Gnome.CanvasGroup
 {
 	public static int PIECE_SIZE = 50;
 	public int Number;
-	public int Position;
+	int position;
 	public CanvasText Text;
 	public BoardPiece [] Board;
 	public static bool Debug = false;
@@ -226,7 +227,17 @@ public class BoardPiece : Gnome.CanvasGroup
 			return String.Format ("#{0:x2}{1:x2}{2:x2}", r, g, b);
 		}
 	}
-			
+
+	public int Position {
+		get {
+			return position;
+		}
+
+		set {
+			Board [value] = this;
+			position = value;
+		}
+	}
 
 	static void Piece_Event (object o, CanvasEventArgs args)
 	{
@@ -272,8 +283,7 @@ public class BoardPiece : Gnome.CanvasGroup
 			if (toMove) {
 				int new_position = y * 4 + x;
 				Print_Position ("to", new_position, false);
-				piece.Board [piece.Position] = null;
-				piece.Board [new_position] = piece;
+ 				piece.Board [piece.Position] = null;
 				piece.Position = new_position;
 				piece.Move (dx * PIECE_SIZE, dy * PIECE_SIZE);
 			} else
diff --git a/sample/pixmaps/gnome-color-browser.png b/sample/pixmaps/gnome-color-browser.png
new file mode 100644
index 0000000000000000000000000000000000000000..be41582fcc433dd9b795ece3b37ae7012086368b
GIT binary patch
literal 2212
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

literal 0
HcmV?d00001