diff options
| author | Alexander Larsson <alexl@redhat.com> | 2012-10-29 20:27:11 +0100 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2012-10-30 08:30:28 +0100 |
| commit | 2273ec0598e3b4a5b6bbd64e7bfdd5f10eb41846 (patch) | |
| tree | 7e01689c556256804d54df47744fb78792ab7026 | |
| parent | e11058654ae7a42d20a5cb3b5de7fce0d27e1e93 (diff) | |
DisplayPage: move toolbar out of overlay
This way we can have notifications inside the overlay, under
the toolbar.
https://bugzilla.gnome.org/show_bug.cgi?id=679106
| -rw-r--r-- | src/display-page.vala | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/display-page.vala b/src/display-page.vala index 5063823..599531d 100644 --- a/src/display-page.vala +++ b/src/display-page.vala @@ -25,7 +25,7 @@ private class Boxes.DisplayToolbar: Gd.MainToolbar { } private class Boxes.DisplayPage: GLib.Object { - public Widget widget { get { return overlay; } } + public Widget widget { get { return box; } } private Overlay overlay; private EventBox event_box; @@ -96,7 +96,6 @@ private class Boxes.DisplayPage: GLib.Object { box = new Box (Orientation.VERTICAL, 0); box.pack_start (toolbar, false, false, 0); - box.pack_start (event_box, true, true, 0); overlay = new Overlay (); App.app.window.window_state_event.connect ((event) => { @@ -105,14 +104,16 @@ private class Boxes.DisplayPage: GLib.Object { return false; }); overlay.margin = 0; - overlay.add (box); + overlay.add (event_box); + + box.pack_start (overlay, true, true, 0); overlay_toolbar = new DisplayToolbar (); overlay_toolbar.set_valign (Gtk.Align.START); overlay.add_overlay (overlay_toolbar); overlay.get_style_context ().add_class ("boxes-toplevel"); - overlay.show_all (); + box.show_all (); } public void get_size (out int width, out int height) { |