[gnome-games/gnibbles-clutter] Using the same value everywhere when resizing splashscreen

[Guillaume Béland <guillaubel src gnome org>]

commit c938beb7e0d994f0ff03f26433c7df79514e278a
Author: Guillaume Beland <guillaume beland gmail com>
Date:   Sun Oct 4 20:29:02 2009 -0400

    Using the same value everywhere when resizing splashscreen

 gnibbles/main.c |   36 +++++++++++++++++++-----------------
 1 files changed, 19 insertions(+), 17 deletions(-)
---
diff --git a/gnibbles/main.c b/gnibbles/main.c
index 00d5873..21876b5 100644
--- a/gnibbles/main.c
+++ b/gnibbles/main.c
@@ -932,7 +932,8 @@ render_logo (void)
   ClutterColor shadow_color = {0x00, 0x00, 0x00, 0x88};
   ClutterActor *text_group;
   static gint width, height;
-  gint size;
+  gint size; 
+  gfloat stage_w, stage_h;
   PangoFontDescription *pfd;
   PangoLayout *layout;
   PangoContext *context;
@@ -948,10 +949,11 @@ render_logo (void)
     gnibbles_load_logo (properties->tilesize);
 
   image = gtk_clutter_texture_new_from_pixbuf (logo_pixmap);
+  
+  stage_w = board->width * properties->tilesize;
+  stage_h = board->height * properties->tilesize;
 
-  clutter_actor_set_size (CLUTTER_ACTOR (image),
-                          board->width * properties->tilesize, 
-                          board->height * properties->tilesize);
+  clutter_actor_set_size (CLUTTER_ACTOR (image), stage_w, stage_h);
 
   clutter_actor_set_position (CLUTTER_ACTOR (image), 0, 0);
   clutter_actor_show (image);
@@ -964,7 +966,7 @@ render_logo (void)
   pfd = pango_context_get_font_description (context);
   size = pango_font_description_get_size (pfd);
   
-  pango_font_description_set_size (pfd, (size * CLUTTER_STAGE_WIDTH ()) / 100);
+  pango_font_description_set_size (pfd, (size * stage_w) / 100);
   pango_font_description_set_family (pfd, "Sans");
   pango_font_description_set_weight(pfd, PANGO_WEIGHT_BOLD); 
   pango_layout_set_font_description (layout, pfd);
@@ -979,17 +981,17 @@ render_logo (void)
   pango_layout_set_text (layout, nibbles, -1);
 
   clutter_actor_set_position (CLUTTER_ACTOR (text), 
-                              (CLUTTER_STAGE_WIDTH () - width) * 0.5 + 60, 
-                              CLUTTER_STAGE_HEIGHT () * .80);
+                              (stage_w - width) * 0.5 + 60, 
+                              stage_h * .80);
   clutter_actor_set_position (CLUTTER_ACTOR (text_shadow),
-                              (CLUTTER_STAGE_WIDTH () - width) * 0.5 + 65,
-                              CLUTTER_STAGE_HEIGHT () * .80 + 5);
+                              (stage_w - width) * 0.5 + 65,
+                              stage_h * .80 + 5);
 
   desc = clutter_text_new ();
   layout = clutter_text_get_layout (CLUTTER_TEXT (desc));
   
   clutter_text_set_color (CLUTTER_TEXT (desc), &actor_color);
-  pango_font_description_set_size (pfd, (size * CLUTTER_STAGE_WIDTH ()) / 400);
+  pango_font_description_set_size (pfd, (size * stage_w) / 400);
   pango_layout_set_font_description (layout, pfd);
   pango_layout_set_text (layout, description, -1);
   pango_layout_get_pixel_size(layout, &width, &height); 
@@ -998,16 +1000,16 @@ render_logo (void)
   layout = clutter_text_get_layout (CLUTTER_TEXT (desc_shadow));
   clutter_text_set_color (CLUTTER_TEXT (desc_shadow), &shadow_color);
 
-  pango_font_description_set_size (pfd, (size * CLUTTER_STAGE_WIDTH ()) / 400);
+  pango_font_description_set_size (pfd, (size * stage_w) / 400);
   pango_layout_set_font_description (layout, pfd);
   pango_layout_set_text (layout, description, -1);
 
   clutter_actor_set_position (CLUTTER_ACTOR (desc), 
-                              (CLUTTER_STAGE_WIDTH () - width) * 0.5 + 50,
-                              CLUTTER_STAGE_HEIGHT ());
+                              (stage_w - width) * 0.5 + 50,
+                              stage_h);
   clutter_actor_set_position (CLUTTER_ACTOR (desc_shadow),
-                              (CLUTTER_STAGE_WIDTH () - width) * 0.5 + 53,
-                              CLUTTER_STAGE_HEIGHT () + 3);  
+                              (stage_w - width) * 0.5 + 53,
+                              stage_h + 3);  
 
   clutter_container_add (CLUTTER_CONTAINER (text_group),
                          CLUTTER_ACTOR (text_shadow),
@@ -1026,8 +1028,8 @@ render_logo (void)
                           "opacity", 0xff,
                           "scale-x", 1.0,
                           "scale-y", 1.0,
-                          "fixed::scale-center-y", CLUTTER_STAGE_WIDTH () / 2,
-                          "fixed::scale-center-x", CLUTTER_STAGE_HEIGHT () / 2,
+                          "fixed::scale-center-y", stage_w / 2,
+                          "fixed::scale-center-x", stage_h / 2,
                           NULL);
 
   clutter_container_add_actor (CLUTTER_CONTAINER (stage),