ayatana-commits team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Cody Russell (bratsche)
Related merge proposals:
  https://code.launchpad.net/~bratsche/xsplash/logo-placement/+merge/10920
  proposed by: Cody Russell (bratsche)
  review: Approve - Neil J. Patel (njpatel)
------------------------------------------------------------
revno: 57 [merge]
committer: Cody Russell <crussell@xxxxxxxxxxxxx>
branch nick: xsplash
timestamp: Mon 2009-08-31 09:37:08 -0500
message:
  merge logo-placement in
modified:
  src/xsplash.c


--
lp:xsplash
https://code.launchpad.net/~xsplash-team/xsplash/trunk

Your team ayatana-commits is subscribed to branch lp:xsplash.
To unsubscribe from this branch go to https://code.launchpad.net/~xsplash-team/xsplash/trunk/+edit-subscription.

=== modified file 'src/xsplash.c'
--- src/xsplash.c	2009-08-26 15:29:53 +0000
+++ src/xsplash.c	2009-08-31 14:24:02 +0000
@@ -384,8 +384,8 @@
 
   image = gtk_image_new_from_pixbuf (logo);
   gtk_fixed_put (GTK_FIXED (fixed), image,
-                 gdk_pixbuf_get_width (pixbuf) / 2 - gdk_pixbuf_get_width (logo) / 2,
-                 gdk_pixbuf_get_height (pixbuf) / 3 - gdk_pixbuf_get_height (logo) / 2);
+                 gdk_screen_get_width (priv->screen) / 2 - gdk_pixbuf_get_width (logo) / 2,
+                 gdk_screen_get_height (priv->screen) / 3 - gdk_pixbuf_get_height (logo) / 2);
 
   if (throbber_image && throbber_frames)
     {
@@ -397,8 +397,8 @@
           gtk_widget_show (priv->throbber);
 
           gtk_fixed_put (GTK_FIXED (fixed), priv->throbber,
-                         gdk_pixbuf_get_width (pixbuf) / 2 - gdk_pixbuf_get_width (priv->throbber_pixbuf) / 2,
-                         gdk_pixbuf_get_height (pixbuf) / 3 + gdk_pixbuf_get_height (logo) + gdk_pixbuf_get_height (priv->throbber_pixbuf) / ((throbber_frames - 1) * 2));
+                         gdk_screen_get_width (priv->screen) / 2 - gdk_pixbuf_get_width (priv->throbber_pixbuf) / 2,
+                         gdk_screen_get_height (priv->screen) / 3 + gdk_pixbuf_get_height (logo) + gdk_pixbuf_get_height (priv->throbber_pixbuf) / ((throbber_frames - 1) * 2));
           start_throbber (server);
         }
       else