Fix sizing issues

Author: leolost2605

sample/SampleIndicator.vala

@@ -26,7 +26,7 @@ public class Sample.Indicator : Wingpanel.Indicator {
     private Gtk.Overlay display_widget;
 
     /* The main widget that is displayed in the popover */
-    private Gtk.Grid main_widget;
+    private Gtk.Box main_widget;
 
     public Indicator () {
         /* Some information about the indicator */
@@ -62,10 +62,10 @@ public class Sample.Indicator : Wingpanel.Indicator {
 
         var compositing_switch = new Granite.SwitchModelButton (_("Composited Icon"));
 
-        main_widget = new Gtk.Grid ();
-        main_widget.attach (hide_button, 0, 0);
-        main_widget.attach (separator, 0, 1);
-        main_widget.attach (compositing_switch, 0, 2);
+        main_widget = new Gtk.Box (VERTICAL, 0);
+        main_widget.append (hide_button);
+        main_widget.append (separator);
+        main_widget.append (compositing_switch);
 
         /* Indicator should be visible at startup */
         this.visible = true;

src/Widgets/IndicatorPopover.vala

@@ -18,36 +18,26 @@
  */
 
 public class Wingpanel.Widgets.IndicatorPopover : Gtk.Popover {
-    private unowned Gtk.Widget? widget = null;
-
-    private Gtk.Box container;
+    private Granite.Bin container;
 
     construct {
         width_request = 256;
         name = name + "/popover";
         position = Gtk.PositionType.BOTTOM;
 
-        container = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0) {
+        container = new Granite.Bin () {
             margin_top = 3,
-            margin_bottom = 3
+            margin_bottom = 3,
         };
 
         child = container;
     }
 
     public void set_content (Gtk.Widget? content) {
-        if (content == widget) {
+        if (container.child == content) {
             return;
         }
 
-        if (widget != null) {
-            container.remove (widget);
-            widget = null;
-        }
-
-        if (content != null) {
-            container.append (content);
-            widget = content;
-        }
+        container.child = content;
     }
 }