Merge lp:~christriant/scratch/fix-1258291 into lp:~elementary-apps/scratch/scratch

[Chris Triantafillis]

[Mario Guerriero (mefrio-g)]

it does not work. Browser preview is always shown.

review: Needs Fixing

Unmerged revisions

1255. By Chris Triantafillis on 2014-03-12

Fixed lp:1258291

=== modified file 'plugins/browser-preview/browser-preview.vala'
--- plugins/browser-preview/browser-preview.vala	2013-11-30 22:43:00 +0000
+++ plugins/browser-preview/browser-preview.vala	2014-03-12 18:08:24 +0000
@@ -29,6 +29,7 @@
     WebView? view = null;
     Gtk.ScrolledWindow? scrolled = null;
     Scratch.Services.Document? doc = null;
+    Gtk.Paned pane = null;
 
     Scratch.Services.Interface plugins;
     public Object object { owned get; construct; }
@@ -40,11 +41,12 @@
         plugins = (Scratch.Services.Interface) object;
 
         plugins.hook_document.connect ((d) => {
+            pane.show_all();
             this.doc = d;
         });
-        
+
         plugins.hook_split_view.connect (on_hook_split_view);
-        
+
         plugins.hook_notebook_context.connect (on_hook_context);
 
         plugins.hook_toolbar.connect (on_hook_toolbar);
@@ -58,7 +60,7 @@
             scrolled.destroy ();
 
     }
-    
+
     void on_hook_split_view (Scratch.Widgets.SplitView view) {
         this.tool_button.visible = ! view.is_empty ();
         this.tool_button.no_show_all = view.is_empty ();
@@ -71,7 +73,7 @@
             this.tool_button.no_show_all = false;
         });
     }
-    
+
     void on_hook_toolbar (Scratch.Widgets.Toolbar toolbar) {
         if (tool_button != null)
             return;
@@ -110,8 +112,8 @@
     	scrolled.add (view);
 
     	notebook.append_page (scrolled, new Gtk.Label (_("Web preview")));
-
-    	scrolled.show_all ();
+        pane = notebook.parent as Gtk.Paned;
+    	//scrolled.show_all ();
     }
 
 }
@@ -121,4 +123,4 @@
     var objmodule = module as Peas.ObjectModule;
     objmodule.register_extension_type (typeof (Peas.Activatable),
                                      typeof (Scratch.Plugins.BrowserPreview));
-}
+}
\ No newline at end of file