Merge lp:~hzliu123/ubiquity/fix-stretched-wallpaper.lp1207249 into lp:ubiquity

[Hao-Ran Liu]

src/wallpaper/wallpaper.c: Cropping wallpaper image instead of stretching it if image's aspect ratio doesn't match monitor's aspect ratio (LP: #1207249)

This patch is for fixing bug 1207249.

src/wallpaper/wallpaper.c:
Cropping wallpaper image instead of stretching it if image's aspect ratio doesn't match monitor's aspect ratio

[Dimitri John Ledkov (xnox)]

This only needed for precise. Rejecting this branch, will accept the other one.

Unmerged revisions

5972. By Hao-Ran Liu on 2013-08-01

[ Hao-Ran Liu ]
src/wallpaper/wallpaper.c: Cropping wallpaper image instead of stretching
it if image's aspect ratio doesn't match monitor's aspect ratio
(LP: #1207249)

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-31 12:57:08 +0000
+++ debian/changelog	2013-08-01 11:45:41 +0000
@@ -5,7 +5,12 @@
   * Refactor network manager code to create a separte GTK class and
     base class for both frontends to use
 
- -- Jonathan Riddell <[e-mail]>  Wed, 31 Jul 2013 13:55:44 +0100
+  [ Hao-Ran Liu ]
+  * src/wallpaper/wallpaper.c: Cropping wallpaper image instead of stretching 
+    it if image's aspect ratio doesn't match monitor's aspect ratio 
+    (LP: #1207249)
+
+ -- Hao-Ran Liu (Joseph Liu) <[e-mail]>  Thu, 01 Aug 2013 19:27:26 +0800
 
 ubiquity (2.15.12) saucy; urgency=low
 

=== modified file 'src/wallpaper/wallpaper.c'
--- src/wallpaper/wallpaper.c	2012-04-23 14:13:08 +0000
+++ src/wallpaper/wallpaper.c	2013-08-01 11:45:41 +0000
@@ -98,11 +98,35 @@
 		c = cairo_create (surface);
 		for (monitor = 0; monitor < gdk_screen_get_n_monitors (screen); monitor++) {
 			gdk_screen_get_monitor_geometry (screen, monitor, &monitor_geometry);
-			GdkPixbuf *pixbuf = gdk_pixbuf_scale_simple (background_pixbuf,
-				monitor_geometry.width, monitor_geometry.height,
-				GDK_INTERP_BILINEAR);
+			int img_w = gdk_pixbuf_get_width(background_pixbuf);
+			int img_h = gdk_pixbuf_get_height(background_pixbuf);
+			float monitor_aspect_ratio = (float) monitor_geometry.width / monitor_geometry.height;
+			float img_aspect_ratio = (float) img_w / img_h;
+			GdkPixbuf *subpixbuf = NULL;
+
+            /* Crop image to fit the aspect ratio of monitor */
+			if (monitor_aspect_ratio > img_aspect_ratio) {
+				/* cut areas in upper and bottom edge */
+				int cut_h = img_h - img_w / monitor_aspect_ratio;
+				subpixbuf = gdk_pixbuf_new_subpixbuf (background_pixbuf, 0, cut_h/2, img_w, img_h-cut_h);
+			} else if (monitor_aspect_ratio < img_aspect_ratio) {
+				/* cut areas in left and right edge */
+				int cut_w = img_w - img_h * monitor_aspect_ratio;
+				subpixbuf = gdk_pixbuf_new_subpixbuf (background_pixbuf, cut_w/2, 0, img_w-cut_w, img_h);
+			}
+			GdkPixbuf *pixbuf;
+			if (subpixbuf != NULL) 
+				pixbuf = gdk_pixbuf_scale_simple (subpixbuf, 
+					monitor_geometry.width, monitor_geometry.height,
+					GDK_INTERP_BILINEAR);
+			else 
+				pixbuf = gdk_pixbuf_scale_simple (background_pixbuf,
+					monitor_geometry.width, monitor_geometry.height,
+					GDK_INTERP_BILINEAR);
 			gdk_cairo_set_source_pixbuf (c, pixbuf, monitor_geometry.x, monitor_geometry.y);
 			g_object_unref (pixbuf);
+			if (subpixbuf) 
+				g_object_unref (subpixbuf);
 			cairo_paint (c);
 		}
 		cairo_destroy (c);