Merge lp:~elementary-apps/audience/headerbar into lp:~audience-members/audience/gtk-3.12

[Danielle Foré]

uses CSD titlebar

use CSD titlebar

[Victor Martinez (victored)]

Works fine.

review: Approve

[Corentin Noël (tintou)]

Let's go for it !

review: Approve

[Danielle Foré (danrabbit)]

I think we have to manually merge. I don't think rabbitbot will merge to another branch :p

[Danielle Foré (danrabbit)]

This is supposedly merged, but I don't see the revision where it was merged...

[David Gomes (davidgomes)]

>p:~audience-members/audience/gtk-3.12

[Danielle Foré (danrabbit)]

David, please notice that on that page there is no revision where this branch is merged.

=== modified file 'src/Audience.vala'
--- src/Audience.vala	2014-05-02 22:16:10 +0000
+++ src/Audience.vala	2014-05-08 03:02:39 +0000
@@ -109,6 +109,12 @@
             mainbox.pack_start (clutter);
             mainbox.pack_start (welcome);
 
+            var header = new Gtk.HeaderBar ();
+            header.set_show_close_button (true);
+            header.get_style_context ().remove_class ("header-bar");
+
+            mainwindow.set_titlebar (header);
+
             mainwindow.events |= Gdk.EventMask.POINTER_MOTION_MASK;
             mainwindow.events |= Gdk.EventMask.LEAVE_NOTIFY_MASK;
             mainwindow.events |= Gdk.EventMask.BUTTON_PRESS_MASK;