123

diff --git a/applet/src/livewp-home-widget.c b/applet/src/livewp-home-widget.c
index fb9f070..6e427e3 100644 (file)
--- a/applet/src/livewp-home-widget.c
+++ b/applet/src/livewp-home-widget.c
@@ -188,6 +188,8 @@ init_object(gchar * name, gchar * filename, gint x, gint y, gint z, gint width,
   g_object_set_data(G_OBJECT(actor), "x", x);
   g_object_set_data(G_OBJECT(actor), "y", y);
   g_object_set_data(G_OBJECT(actor), "z", z);
+  g_object_set_data(G_OBJECT(actor), "width", width);
+  g_object_set_data(G_OBJECT(actor), "height", height);
   g_object_set_data(G_OBJECT(actor), "scale", scale);
   g_object_set_data(G_OBJECT(actor), "visible", visible);
   g_object_set_data(G_OBJECT(actor), "opacity", opacity);
@@ -230,16 +232,18 @@ void change_sun(GtkWidget * actor, gpointer data)
 void change_tram(GtkWidget * actor, gpointer data)
 {
     double alt, azm;
-    gint x, y, z, scale, sc, daytime;
+    gint x, y, z, scale, width, height, daytime;
     //fprintf(stderr, "change sun \n");
     if (actor){
         x = g_object_get_data(G_OBJECT(actor), "x");
         y = g_object_get_data(G_OBJECT(actor), "y");
         scale = g_object_get_data(G_OBJECT(actor), "scale");
+        width = g_object_get_data(G_OBJECT(actor), "width");
+        height = g_object_get_data(G_OBJECT(actor), "height");
         x = x + 5;
-        if (x > 480+350) x = -350;
+        if (x > 480+width) x = -width;
         scale = (x + 400) * 50 / 880 + 100;
-        y = y - 240 * (scale-100) / 100;
+        y = y - height * (scale-100) / 100;
         
         //fprintf(stderr, "scale =%i y=%i\n", y,scale);
         actor_set_position_full(actor, x, y, g_object_get_data(G_OBJECT(actor), "z"));
@@ -314,22 +318,9 @@ init_scene(GtkWidget *window)
   actor = init_object("border", "border.png", 0, 480-79, 30, 800, 79, 1, 100, 255, NULL);
   scene.static_actors = g_slist_append(scene.static_actors, G_OBJECT(actor));
   
-  actor = init_object("tram", "tram.png", -350, 60+480-374+34, 25, 350, 274, 1, 100, 255, &change_tram);
+  actor = init_object("tram", "tram.png", -350, 60+480-374+34, 25, 350, 240, 1, 100, 255, &change_tram);
   scene.dynamic_actors = g_slist_append(scene.dynamic_actors, G_OBJECT(actor));
   
-/*
-  actor = init_object("cloud1", 400, 150, 2, 200, 150, NULL);
-  scene.dynamic_actors = g_slist_append(scene.dynamic_actors, G_OBJECT(actor));
-
-  actor = init_object("sun", 10, 10, 50, 88, 88, NULL);
-  list = g_slist_append(list, G_OBJECT(actor));
-  actor = init_object("cloud1", 50, 50, 49, 150, 100, NULL);
-  list = g_slist_append(list, G_OBJECT(actor));
-
-  ma1 = multiactor_init("multi", list, 0, 0, 50, 1.0, TRUE);
-  //objects_list = g_slist_append(objects_list, G_OBJECT(ma)); 
-  */
-
 }
 static void
 init_scene1(GtkWidget *window)