[ease] Fixed a runtime Clutter warning, added "out" to two parameters that previously built fine (new Vala



commit 4281cc7690c8f33e2d1a41ebbeed6cddcafe9552
Author: Nate Stedman <natesm gmail com>
Date:   Tue Jun 8 18:53:24 2010 -0400

    Fixed a runtime Clutter warning, added "out" to two parameters that previously built fine (new Vala 0.9.1 error?)

 src/EditorEmbed.vala    |   14 +-------------
 src/MasterElement.vala  |    5 +++++
 src/SlideButton.vala    |    2 +-
 src/TransitionPane.vala |    2 +-
 4 files changed, 8 insertions(+), 15 deletions(-)
---
diff --git a/src/EditorEmbed.vala b/src/EditorEmbed.vala
index 2a95b1c..c2bbe75 100644
--- a/src/EditorEmbed.vala
+++ b/src/EditorEmbed.vala
@@ -31,9 +31,6 @@ public class Ease.EditorEmbed : ScrollableEmbed
 {
 	// the editorwindow
 	private EditorWindow win;
-
-	// overall display
-	private Clutter.Rectangle view_background;
 	
 	// selection rectangle
 	private Clutter.Rectangle selection_rectangle;
@@ -88,9 +85,6 @@ public class Ease.EditorEmbed : ScrollableEmbed
 		
 		// don't fade actors out when zoomed out
 		get_stage().use_fog = false;
-
-		// set up the background
-		view_background = new Clutter.Rectangle();
 		
 		// find the appropriate color
 		var settings = Gtk.Settings.get_default();
@@ -116,14 +110,12 @@ public class Ease.EditorEmbed : ScrollableEmbed
 				
 				clutter_color.shade(SHADE_FACTOR, out out_color);
 				
-				view_background.color = out_color;
+				get_stage().color = out_color;
 				
 				break;
 			}
 		}
 		
-		contents.add_actor(view_background);
-		
 		document = d;
 		set_size_request(320, 240);
 
@@ -143,10 +135,6 @@ public class Ease.EditorEmbed : ScrollableEmbed
 			{
 				reposition_group();
 			}
-
-			// set the size of the background
-			view_background.width = (float)Math.fmax(width, slide_actor.width);
-			view_background.height = height;
 		});
 	}
 
diff --git a/src/MasterElement.vala b/src/MasterElement.vala
index 80a03bb..65a67d8 100644
--- a/src/MasterElement.vala
+++ b/src/MasterElement.vala
@@ -167,6 +167,11 @@ public class Ease.MasterElement : Element
 		set { data.set("right", value.to_string()); }
 	}
 	
+	public MasterElement()
+	{
+		data = new ElementMap();
+	}
+	
 	/**
 	 * Creates an { link Element} from this MasterElement at the specified size.
 	 *
diff --git a/src/SlideButton.vala b/src/SlideButton.vala
index fb77819..ea4772d 100644
--- a/src/SlideButton.vala
+++ b/src/SlideButton.vala
@@ -116,7 +116,7 @@ public class Ease.SlideButton : Gtk.Button
 		
 		// get the size of the drawing area
 		var allocation = Gtk.Allocation();
-		drawing.get_allocation(allocation);
+		drawing.get_allocation(out allocation);
 		
 		context.save();
 		context.scale(((float)allocation.width) / slide.parent.width,
diff --git a/src/TransitionPane.vala b/src/TransitionPane.vala
index a503d41..1306f25 100644
--- a/src/TransitionPane.vala
+++ b/src/TransitionPane.vala
@@ -253,7 +253,7 @@ public class Ease.TransitionPane : InspectorPane
 		
 		// size the preview box
 		Gtk.Allocation alloc = Gtk.Allocation();
-		preview_align.get_allocation(alloc);
+		preview_align.get_allocation(out alloc);
 		preview_align.height_request = (int)(alloc.width / slide.parent.aspect);
 		
 		// remove the old preview slide actors



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]