[gnome-calculator/wip/glade: 4/4] WIP progress: still problems with MathDisplay sizes and converter not showing up on keyboard mode

[Alberto Ruiz <aruiz src gnome org>]

commit 92a5b5a1494e3622655fd26841531b0fae0f46ad
Author: Alberto Ruiz <aruiz gnome org>
Date:   Tue Jan 12 02:13:34 2016 +0000

    WIP progress: still problems with MathDisplay sizes and converter not showing up on keyboard mode

 data/math-window.ui   |   11 +++++------
 src/math-buttons.vala |    2 +-
 src/math-window.vala  |    3 +++
 3 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/data/math-window.ui b/data/math-window.ui
index b9f2b25..ab7ffce 100644
--- a/data/math-window.ui
+++ b/data/math-window.ui
@@ -21,13 +21,18 @@
     <property name="show_menubar">False</property>
     <child>
       <object class="GtkGrid" id="grid">
+        <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="vexpand">True</property>
         <property name="border_width">6</property>
+        <property name="orientation">vertical</property>
+        <property name="column_spacing">6</property>
         <child>
           <object class="GtkScrolledWindow" id="scrolled_window">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
             <property name="hadjustment">hadjustment</property>
             <property name="vadjustment">vadjustment</property>
             <property name="hscrollbar_policy">never</property>
@@ -41,12 +46,6 @@
             <property name="top_attach">0</property>
           </packing>
         </child>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
       </object>
     </child>
     <child type="titlebar">
diff --git a/src/math-buttons.vala b/src/math-buttons.vala
index 1207eff..9fd6333 100644
--- a/src/math-buttons.vala
+++ b/src/math-buttons.vala
@@ -94,7 +94,7 @@ public class MathButtons : Gtk.Box
 
     public MathButtons (MathEquation equation)
     {
-        Object (orientation: Gtk.Orientation.VERTICAL);
+        Object (orientation: Gtk.Orientation.VERTICAL, vexpand_set: true);
         spacing = 6;
         show.connect (load_buttons);
         this.equation = equation;
diff --git a/src/math-window.vala b/src/math-window.vala
index 72008cd..2b1f9b2 100644
--- a/src/math-window.vala
+++ b/src/math-window.vala
@@ -29,6 +29,8 @@ public class MathWindow : Gtk.ApplicationWindow
     private Gtk.Label mode_label;
     [GtkChild]
     private Gtk.ScrolledWindow scrolled_window;
+    [GtkChild]
+    private Gtk.Grid grid;
 
     private const ActionEntry[] window_entries =
     {
@@ -68,6 +70,7 @@ public class MathWindow : Gtk.ApplicationWindow
         _display.grabfocus ();
 
         _buttons = new MathButtons (equation);
+        grid.add(buttons);
 
         if (_buttons.mode != ButtonMode.KEYBOARD) /* Checks if the calculator is in Keyboard mode or not */
         {