[sushi/wip/cosimoc/no-clutter: 22/36] mainWindow: adjust toolbar creation code

[Cosimo Cecchi <cosimoc src gnome org>]

commit 9ddfe2fc7fa62a683d749f4c34868ea7fd430971
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Mon Apr 3 12:49:52 2017 -0700

    mainWindow: adjust toolbar creation code
    
    And make sure it's properly centered.

 src/js/ui/mainWindow.js  |   13 ++++++-------
 src/js/viewers/evince.js |    3 ++-
 src/js/viewers/html.js   |    3 ++-
 src/js/viewers/image.js  |    3 ++-
 src/js/viewers/text.js   |    3 ++-
 5 files changed, 14 insertions(+), 11 deletions(-)
---
diff --git a/src/js/ui/mainWindow.js b/src/js/ui/mainWindow.js
index 28f58ea..3a22790 100644
--- a/src/js/ui/mainWindow.js
+++ b/src/js/ui/mainWindow.js
@@ -265,7 +265,12 @@ const MainWindow = new Lang.Class({
 
         if (this._renderer.createToolbar) {
             let rendererToolbar = this._renderer.createToolbar();
-            this._toolbar = new Gtk.Revealer({ transition_duration: 250,
+            this._toolbar = new Gtk.Revealer({ valign: Gtk.Align.END,
+                                               hexpand: true,
+                                               margin_bottom: Constants.TOOLBAR_SPACING,
+                                               margin_start: Constants.TOOLBAR_SPACING,
+                                               margin_end: Constants.TOOLBAR_SPACING,
+                                               transition_duration: 250,
                                                transition_type: Gtk.RevealerTransitionType.CROSSFADE,
                                                visible: true });
             this._toolbar.add(rendererToolbar);
@@ -274,12 +279,6 @@ const MainWindow = new Lang.Class({
         if (!this._toolbar)
             return;
 
-        this._toolbar.margin_bottom = Constants.TOOLBAR_SPACING;
-        this._toolbar.margin_start = Constants.TOOLBAR_SPACING;
-        this._toolbar.margin_end = Constants.TOOLBAR_SPACING;
-        this._toolbar.halign = Gtk.Align.CENTER;
-        this._toolbar.valign = Gtk.Align.END;
-
         this._embed.add_overlay(this._toolbar);
     },
 
diff --git a/src/js/viewers/evince.js b/src/js/viewers/evince.js
index bc8ba92..3450a92 100644
--- a/src/js/viewers/evince.js
+++ b/src/js/viewers/evince.js
@@ -120,7 +120,8 @@ const EvinceRenderer = new Lang.Class({
     },
 
     createToolbar : function() {
-        this._mainToolbar = new Gtk.Toolbar({ icon_size: Gtk.IconSize.MENU });
+        this._mainToolbar = new Gtk.Toolbar({ icon_size: Gtk.IconSize.MENU,
+                                              halign: Gtk.Align.CENTER });
         this._mainToolbar.get_style_context().add_class('osd');
         this._mainToolbar.set_show_arrow(false);
         this._mainToolbar.show();
diff --git a/src/js/viewers/html.js b/src/js/viewers/html.js
index 9f427aa..1070686 100644
--- a/src/js/viewers/html.js
+++ b/src/js/viewers/html.js
@@ -66,7 +66,8 @@ const HTMLRenderer = new Lang.Class({
     },
 
     createToolbar : function() {
-        this._mainToolbar = new Gtk.Toolbar({ icon_size: Gtk.IconSize.MENU });
+        this._mainToolbar = new Gtk.Toolbar({ icon_size: Gtk.IconSize.MENU,
+                                              halign: Gtk.Align.CENTER });
         this._mainToolbar.get_style_context().add_class('osd');
         this._mainToolbar.set_show_arrow(false);
         this._mainToolbar.show();
diff --git a/src/js/viewers/image.js b/src/js/viewers/image.js
index aa3d508..e1c9e7f 100644
--- a/src/js/viewers/image.js
+++ b/src/js/viewers/image.js
@@ -188,7 +188,8 @@ const ImageRenderer = new Lang.Class({
     },
 
     createToolbar : function() {
-        this._mainToolbar = new Gtk.Toolbar({ icon_size: Gtk.IconSize.MENU });
+        this._mainToolbar = new Gtk.Toolbar({ icon_size: Gtk.IconSize.MENU,
+                                              halign: Gtk.Align.CENTER });
         this._mainToolbar.get_style_context().add_class('osd');
         this._mainToolbar.set_show_arrow(false);
         this._mainToolbar.show();
diff --git a/src/js/viewers/text.js b/src/js/viewers/text.js
index 4e844cf..1143c81 100644
--- a/src/js/viewers/text.js
+++ b/src/js/viewers/text.js
@@ -105,7 +105,8 @@ const TextRenderer = new Lang.Class({
     },
 
     createToolbar : function() {
-        this._mainToolbar = new Gtk.Toolbar({ icon_size: Gtk.IconSize.MENU });
+        this._mainToolbar = new Gtk.Toolbar({ icon_size: Gtk.IconSize.MENU,
+                                              halign: Gtk.Align.CENTER });
         this._mainToolbar.get_style_context().add_class('osd');
         this._mainToolbar.set_show_arrow(false);