xsplash

Merge lp:~bratsche/xsplash/logo-placement into lp:xsplash

  1. logo-placement
  2. Merge into trunk
Proposed by Cody Russell
Status: Merged
Merged at revision: not available
Proposed branch: lp:~bratsche/xsplash/logo-placement
Merge into: lp:xsplash
Diff against target: None lines
To merge this branch: bzr merge lp:~bratsche/xsplash/logo-placement
Reviewer Review Type Date Requested Status
Neil J. Patel (community) Approve
Review via email: mp+10920@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Neil J. Patel (njpatel) wrote :

Looks good. Approved.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/xsplash.c'
2--- src/xsplash.c 2009-08-26 15:29:53 +0000
3+++ src/xsplash.c 2009-08-31 14:24:02 +0000
4@@ -384,8 +384,8 @@
5
6 image = gtk_image_new_from_pixbuf (logo);
7 gtk_fixed_put (GTK_FIXED (fixed), image,
8- gdk_pixbuf_get_width (pixbuf) / 2 - gdk_pixbuf_get_width (logo) / 2,
9- gdk_pixbuf_get_height (pixbuf) / 3 - gdk_pixbuf_get_height (logo) / 2);
10+ gdk_screen_get_width (priv->screen) / 2 - gdk_pixbuf_get_width (logo) / 2,
11+ gdk_screen_get_height (priv->screen) / 3 - gdk_pixbuf_get_height (logo) / 2);
12
13 if (throbber_image && throbber_frames)
14 {
15@@ -397,8 +397,8 @@
16 gtk_widget_show (priv->throbber);
17
18 gtk_fixed_put (GTK_FIXED (fixed), priv->throbber,
19- gdk_pixbuf_get_width (pixbuf) / 2 - gdk_pixbuf_get_width (priv->throbber_pixbuf) / 2,
20- gdk_pixbuf_get_height (pixbuf) / 3 + gdk_pixbuf_get_height (logo) + gdk_pixbuf_get_height (priv->throbber_pixbuf) / ((throbber_frames - 1) * 2));
21+ gdk_screen_get_width (priv->screen) / 2 - gdk_pixbuf_get_width (priv->throbber_pixbuf) / 2,
22+ gdk_screen_get_height (priv->screen) / 3 + gdk_pixbuf_get_height (logo) + gdk_pixbuf_get_height (priv->throbber_pixbuf) / ((throbber_frames - 1) * 2));
23 start_throbber (server);
24 }
25 else

Subscribers

People subscribed via source and target branches