Merge lp:~artem-anufrij/scratch/Bugfix-1395412 into lp:~elementary-apps/scratch/scratch

[Artem Anufrij]

hide zoom button if welcome screen is visible.

hide zoom button if welcome screen is visible.

[Gero.Bare (gero-bare)]

Nice work.
This performs as expected.

review: Approve

=== modified file 'src/MainWindow.vala'
--- src/MainWindow.vala	2014-11-10 18:09:21 +0000
+++ src/MainWindow.vala	2014-11-23 10:55:52 +0000
@@ -203,7 +203,6 @@
                 // Set actions sensitive property
                 main_actions.get_action ("SaveFile").visible = (!settings.autosave || doc.file == null);
                 main_actions.get_action ("SaveFileAs").visible = (doc.file != null);
-                main_actions.get_action ("Zoom").visible = get_current_font_size () != get_default_font_size ();
                 doc.check_undoable_actions ();
             });
 
@@ -317,6 +316,9 @@
             main_actions.get_action ("Revert").sensitive = val;
             this.toolbar.share_app_menu.sensitive = val;
 
+            // Zoom button
+            main_actions.get_action ("Zoom").visible = get_current_font_size () != get_default_font_size () && val;
+
             // PlugIns
             if (val) {
                 on_plugin_toggled (this.contextbar);
@@ -559,7 +561,6 @@
                 font_size = (int) get_default_font_size ();
             }
 
-
             if (direction == ScrollDirection.DOWN) {
                 font_size --;
                 if (font_size < FONT_SIZE_MIN)
@@ -572,6 +573,8 @@
 
             string new_font = font + " " + font_size.to_string ();
             Scratch.settings.font = new_font;
+
+            main_actions.get_action ("Zoom").visible = get_current_font_size () != get_default_font_size () && !split_view.is_empty ();
         }
 
         public string get_current_font () {