Merge lp:~fabiozaramella/noise/dont-use-headerbar into lp:~elementary-apps/noise/trunk

[Fabio Zaramella]

[Cody Garver (codygarver)]

Gtk.Box is/is going to be deprecated, use Grid instead https://developer.gnome.org/gtk3/3.7/gtk-migrating-GtkGrid.html

review: Needs Fixing

[Fabio Zaramella (fabiozaramella)]

it's ok

[lp:~fabiozaramella/noise/dont-use-headerbar]

1618. By Fabio on 2014-07-03

uses headerbar but hides the close button

[Corentin Noël (tintou)]

Please reuse Object (use_header_bar: 1);
and use get_header_bar () to get the header_bar object.

[lp:~fabiozaramella/noise/dont-use-headerbar]

1619. By Fabio on 2014-07-06

need to hide the close button

1620. By Fabio on 2014-07-14

show_close_button (false)

[Fabio Zaramella (fabiozaramella)]

done

[Cody Garver (codygarver)]

Dragging the titlebar drags the whole app, none of the other preferences behave that way

[lp:~fabiozaramella/noise/dont-use-headerbar]

1621. By Fabio on 2014-07-27

transient_for removed

[Cody Garver (codygarver)]

What's the purpose of the 'Allow moving the window' stuff?

[Fabio Zaramella (fabiozaramella)]

Oh it's remained from the tests I was doing. Personally I think that in this way is easier and faster for the user to drag the window instead of being forced to grab the title bar which has also a smaller area. However, if the team thinks it doesn't fit good i can remove it immediately.

[xapantu (xapantu)]

I removed that code and merged it, thanks for your work!

review: Approve

=== modified file 'src/Dialogs/PreferencesWindow.vala'
--- src/Dialogs/PreferencesWindow.vala	2014-03-16 20:34:25 +0000
+++ src/Dialogs/PreferencesWindow.vala	2014-07-27 18:27:58 +0000
@@ -56,6 +56,16 @@
 
         Plugins.Manager.get_default ().hook_preferences_window (this);
 
+        /*
+         *  Allow moving the window
+         */
+        this.button_press_event.connect ( (e) => {
+            if (e.button == 1) {
+                this.begin_move_drag ((int) e.button, (int) e.x_root, (int) e.y_root, e.time);
+                return true;
+            }
+            return false;
+        });
     }
 
 
@@ -85,11 +95,14 @@
         resizable = false;
         window_position = Gtk.WindowPosition.CENTER;
         type_hint = Gdk.WindowTypeHint.DIALOG;
-        transient_for = parent_window;
+
+        (get_header_bar () as Gtk.HeaderBar).show_close_button = false;
+        get_header_bar ().get_style_context ().remove_class ("header-bar");
 
         main_stack = new Gtk.Stack ();
         main_stackswitcher = new Gtk.StackSwitcher ();
         main_stackswitcher.set_stack (main_stack);
+        main_stackswitcher.halign = Gtk.Align.CENTER;
 
         var close_button = new Gtk.Button.with_label (_("Close"));
         close_button.clicked.connect (() => {this.destroy ();});
@@ -99,11 +112,12 @@
         button_box.pack_end (close_button);
         button_box.margin_right = 12;
 
-        var main_grid = new Gtk.Grid ();
-        main_grid.attach (main_stack, 0, 0, 1, 1);
-        main_grid.attach (button_box, 0, 1, 1, 1);
+        // Pack everything into the dialog
+        Gtk.Grid main_grid = new Gtk.Grid ();
+        main_grid.attach (main_stackswitcher, 0, 0, 1, 1);
+        main_grid.attach (main_stack, 0, 1, 1, 1);
+        main_grid.attach (button_box, 0, 2, 1, 1);
 
-        ((Gtk.HeaderBar) get_header_bar ()).set_custom_title (main_stackswitcher);
         ((Gtk.Container) get_content_area ()).add (main_grid);
     }
 }