[ease/iconview] Let's take this apart



commit af648291760e55ea35e7d6df3db088a222fafa7b
Author: Nate Stedman <natesm gmail com>
Date:   Mon Aug 30 09:09:19 2010 -0400

    Let's take this apart

 ease-core/ease-icon-view.vala |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/ease-core/ease-icon-view.vala b/ease-core/ease-icon-view.vala
index 10ffb2a..e869bd6 100644
--- a/ease-core/ease-icon-view.vala
+++ b/ease-core/ease-icon-view.vala
@@ -312,7 +312,7 @@ public class Ease.IconView : ScrollableEmbed
 		var actor = new IconActor();
 		set_actor(actor, iter, path);
 		actors.offer_tail(actor);
-		contents.add_actor(actor);
+		get_stage().add_actor(actor);
 		actor.show();
 		get_stage().show_all();
 		debug("Added Actor");
@@ -357,6 +357,7 @@ public class Ease.IconView : ScrollableEmbed
 		
 		// set the actor's tree path
 		actor.tree_path = tree_path;
+		debug("Actor set");
 	}
 	
 	/**
@@ -419,13 +420,19 @@ public class Ease.IconView : ScrollableEmbed
 			try
 			{
 				GtkClutter.texture_set_from_pixbuf(texture, pixbuf);
-				texture.show();
 				height = width * (texture.height / texture.width) +
 				         2 * TEXT_PADDING + TEXT_HEIGHT;
+				
+				// show the texture and background
+				texture.show();
+				if (texture.get_parent() != this) add_actor(texture);
+				background.show();
+				if (background.get_parent() != this) add_actor(background);
 			}
 			catch (Error e)
 			{
 				texture.hide();
+				background.hide();
 				critical(e.message);
 			}                         
 		}
@@ -438,6 +445,7 @@ public class Ease.IconView : ScrollableEmbed
 			text.use_markup = true;
 			text.text = markup;
 			text.show();
+			if (text.get_parent() != this) add_actor(text);
 		}
 		
 		/**
@@ -448,6 +456,7 @@ public class Ease.IconView : ScrollableEmbed
 			this.text.use_markup = false;
 			this.text.text = text;
 			this.text.show();
+			if (this.text.get_parent() != this) add_actor(this.text);
 		}
 	}
 }



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