Merge lp:~artem-anufrij/webby-browser/webby-browser into lp:webby-browser

[Artem Anufrij]

[Artem Anufrij (artem-anufrij)]

Screenshot:

https://bugs.launchpad.net/webby-browser/+bug/1429613/+attachment/4353631/+files/%D0%A1%D0%BD%D0%B8%D0%BC%D0%BE%D0%BA%20%D1%8D%D0%BA%D1%80%D0%B0%D0%BD%D0%B0%20%D0%BE%D1%82%202015-03-23%2019%3A03%3A17.png

[Erasmo Marín (erasmo-marin)]

Thanks, it looks good. The only thing you need to fix is line 74, can you put the "}" with the "else" in the same line? that's all.

[lp:~artem-anufrij/webby-browser/webby-browser]

11. By Artem Anufrij on 2015-03-23

code style

12. By Artem Anufrij on 2015-03-23

code style

[Artem Anufrij (artem-anufrij)]

done :)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-02-26 20:16:44 +0000
+++ CMakeLists.txt	2015-03-23 21:20:10 +0000
@@ -86,7 +86,7 @@
 #
 
 find_package(PkgConfig)
-pkg_check_modules(DEPS REQUIRED gobject-2.0 glib-2.0 gio-2.0 gtk+-3.0>=3.12 gthread-2.0 granite gee-0.8 webkit2gtk-3.0 libsoup-2.4)
+pkg_check_modules(DEPS REQUIRED gobject-2.0 glib-2.0 gio-2.0 gtk+-3.0>=3.12 gthread-2.0 granite gee-0.8 webkit2gtk-3.0 libsoup-2.4 gdk-pixbuf-2.0)
 
 add_definitions(${DEPS_CFLAGS})
 
@@ -99,15 +99,16 @@
 
 set(PKG_DEPS gtk+-3.0
              granite
-             gio-2.0 
+             gio-2.0
              gee-0.8
              posix
              webkit2gtk-3.0
-             libsoup-2.4)
+             libsoup-2.4
+             gdk-pixbuf-2.0)
 
 
 set(SRC_FILES
-            src/ApplicationsView.vala       
+            src/ApplicationsView.vala
             src/AppWindow.vala
             src/Assistant.vala
             src/DesktopFile.vala
@@ -130,7 +131,7 @@
     --thread
     -g
     --debug
-    --target-glib=2.32 
+    --target-glib=2.32
     )
 
 add_definitions(${CFLAGS}-lm -Wall -Winit-self -Wwrite-strings -Wunreachable-code -Wstrict-prototypes)

=== modified file 'src/ApplicationsView.vala'
--- src/ApplicationsView.vala	2015-02-26 20:16:44 +0000
+++ src/ApplicationsView.vala	2015-03-23 21:20:10 +0000
@@ -10,7 +10,7 @@
         GLib.Object (orientation: Gtk.Orientation.VERTICAL);
         var scrolled = new Gtk.ScrolledWindow (null, null);
         scrolled.hscrollbar_policy = Gtk.PolicyType.NEVER;
-        
+
         icon_view = new Gtk.FlowBox();
         icon_view.valign = Gtk.Align.START;
         icon_view.vexpand = false;
@@ -68,9 +68,32 @@
         vexpand = false;
 
         label = new Gtk.Label (label_str);
-        image = new Gtk.Image();
-        image.icon_name = icon;
-        image.pixel_size = 64;
+
+        if (File.new_for_path (icon).query_exists ()) {
+            var pix = new Gdk.Pixbuf.from_file (icon);
+
+            int new_height = 64;
+            int new_width = 64;
+            int margin_vertical = 0;
+            int margin_horizontal = 0;
+
+            if (pix.height > pix.width) {
+                new_width = new_width * pix.width / pix.height;
+                margin_horizontal = (new_height - new_width) / 2;
+            } else if (pix.height < pix.width) {
+                new_height = new_height * pix.height / pix.width;
+                margin_vertical = (new_width - new_height) / 2;
+            }
+            image = new Gtk.Image.from_pixbuf (pix.scale_simple (new_width, new_height, Gdk.InterpType.BILINEAR));
+            image.margin_top = margin_vertical;
+            image.margin_bottom = margin_vertical;
+            image.margin_right = margin_horizontal;
+            image.margin_left = margin_horizontal;
+        } else {
+            image = new Gtk.Image ();
+            image.icon_name = icon;
+            image.pixel_size = 64;
+        }
 
         this.margin = 5;
         this.margin_start = 20;

=== modified file 'src/Webby.vala'
--- src/Webby.vala	2015-02-26 01:32:45 +0000
+++ src/Webby.vala	2015-03-23 21:20:10 +0000
@@ -13,4 +13,4 @@
 
     Gtk.main ();
     return 0;
-} 
+}