Merge lp:~markodolar/pantheon-calculator/pantheon-calculator into lp:~elementary-apps/pantheon-calculator/trunk

[Adam Bieńkowski]

* Set basic grid alignment to FILL
* Vertically center and expand the entry

Aligns main and extended grid.

[Danielle Foré (danrabbit)]

Looks good, thanks for your branch!

review: Approve

[lp:~markodolar/pantheon-calculator/pantheon-calculator]

290. By MarkoD on 2016-11-02

* Set basic grid alignment to FILL
* Vertically center and expand the entry

=== modified file 'src/MainWindow.vala'
--- src/MainWindow.vala	2016-09-17 23:37:45 +0000
+++ src/MainWindow.vala	2016-11-01 21:44:26 +0000
@@ -121,6 +121,8 @@
             entry.set_alignment (1);
             entry.set_text (settings.get_string ("entry-content"));
             entry.get_style_context ().add_class ("h2");
+            entry.vexpand = true;
+            entry.valign = Gtk.Align.CENTER;
 
             button_calc = new Button ("=", _("Calculate Result"));
             button_calc.get_style_context ().add_class ("h2");
@@ -162,6 +164,8 @@
             var basic_grid = new Gtk.Grid ();
             basic_grid.column_spacing = 6;
             basic_grid.row_spacing = 6;
+            basic_grid.valign = Gtk.Align.FILL;
+
             basic_grid.attach (entry, 0, 0, 4, 1);
             basic_grid.attach (button_del,     0, 1, 1, 1);
             basic_grid.attach (button_undo,    1, 1, 1, 1);