Merge lp:~jonathon-waterhouse/pantheon-files/fix-1325214 into lp:~elementary-apps/pantheon-files/trunk

[Jonathon Waterhouse]

=== modified file 'libwidgets/LocationBar.vala'
--- libwidgets/LocationBar.vala	2014-06-14 19:17:34 +0000
+++ libwidgets/LocationBar.vala	2014-07-14 05:03:50 +0000
@@ -38,7 +38,7 @@
 
     public string current_right_click_path;
     public string current_right_click_root;
-    
+
     protected string text_completion = "";
     protected bool multiple_completions = false;
     protected bool text_changed = false;
@@ -98,7 +98,7 @@
     construct {
         icon_factory = Granite.Services.IconFactory.get_default ();
         icons = new List<IconDirectory?> ();
-        
+
         /* Load arrow image */
         try {
             arrow_img = Gtk.IconTheme.get_default ().load_icon ("go-jump-symbolic", 16, Gtk.IconLookupFlags.GENERIC_FALLBACK);
@@ -125,7 +125,7 @@
         y = 0;
 
         elements = new Gee.ArrayList<BreadcrumbsElement> ();
-        
+
         secondary_icon_activatable = true;
         secondary_icon_sensitive = true;
         truncate_multiline = true;
@@ -145,7 +145,7 @@
         drag_motion.connect (on_drag_motion);
         drag_data_received.connect (on_drag_data_received);
     }
-    
+
     public override bool key_press_event (Gdk.EventKey event) {
         switch (event.keyval) {
             case Gdk.Key.KP_Tab:
@@ -162,19 +162,19 @@
             case Gdk.Key.Up:
                 up ();
                 return true;
-                
+
             case Gdk.Key.Escape:
                 escape ();
                 return true;
         }
-        
+
         return base.key_press_event (event);
     }
 
     public override bool button_press_event (Gdk.EventButton event) {
-        if (is_focus)    
+        if (is_focus)
             return base.button_press_event (event);
-        
+
         foreach (BreadcrumbsElement element in elements)
             element.pressed = false;
 
@@ -199,7 +199,7 @@
                 var newpath = get_path_from_element (el);
                 activate_alternate (get_file_for_path (newpath));
             }
-            
+
             return true;
         }
 
@@ -216,7 +216,7 @@
             Source.remove ((uint) timeout);
             timeout = -1;
         }
-        
+
         if (is_focus)
             return base.button_release_event (event);
 
@@ -229,27 +229,27 @@
             } else
                 grab_focus ();
         }
-        
+
         return base.button_release_event (event);
     }
-    
+
     void on_change () {
         if (ignore_change) {
             ignore_change = false;
             return;
         }
-        
+
         set_entry_icon (true, (text.length > 0) ? "Navigate to: " + text : "");
         text_completion = "";
         need_completion ();
     }
-    
+
     bool on_motion_notify (Gdk.EventMotion event) {
         int x = (int) event.x;
         double x_render = 0;
         double x_previous = -10;
         set_tooltip_text ("");
-        
+
         if (is_focus)
             return base.motion_notify_event (event);
 
@@ -270,7 +270,7 @@
             set_entry_cursor (new Gdk.Cursor (Gdk.CursorType.ARROW));
         else
             set_entry_cursor (null);
-            
+
         return base.motion_notify_event (event);
     }
 
@@ -279,11 +279,11 @@
             ignore_focus_in = true;
             return base.focus_out_event (event);
         }
-    
+
         ignore_focus_in = false;
         set_entry_icon (false);
         set_entry_text ("");
-        
+
         return base.focus_out_event (event);
     }
 
@@ -296,10 +296,10 @@
                 .replace ("file:///", "/")
                 .replace ("trash:///", "")
                 .replace ("network:///", "")));
-                
+
         return base.focus_in_event (event);
     }
-    
+
     void on_grab_focus () {
         select_region (0, 0);
         set_position (-1);
@@ -361,7 +361,7 @@
 
         return false;
     }
-    
+
     protected void add_icon (IconDirectory icon) {
         if (icon.gicon != null)
             icon.icon = icon_factory.load_symbolic_icon_from_gicon (button_context, icon.gicon, 16);
@@ -370,13 +370,13 @@
 
         icons.append (icon);
     }
-    
-    public void complete () {        
+
+    public void complete () {
         if (text_completion.length == 0)
             return;
 
         string path = text + text_completion;
-        
+
         /* If there are multiple results, tab as far as we can, otherwise do the entire result */
         if (!multiple_completions) {
             set_entry_text (path + "/");
@@ -384,26 +384,26 @@
         } else
             set_entry_text (path);
     }
-    
+
     public void reset_elements_states () {
         foreach (BreadcrumbsElement element in elements)
             element.pressed = false;
 
         queue_draw ();
     }
-    
+
     public void set_entry_text (string text) {
         ignore_change = true;
         text_completion = "";
         this.text = text;
         set_position (-1);
     }
-    
+
     public void set_entry_cursor (Gdk.Cursor? cursor) {
         /* Only child 13 needs to be modified for the cursor - there may be a better way to do this */
         get_window ().get_children ().nth_data (13).set_cursor (cursor ?? new Gdk.Cursor (Gdk.CursorType.XTERM));
     }
-    
+
     public void set_entry_icon (bool active, string? tooltip = null) {
         if (!active)
             secondary_icon_pixbuf = null;
@@ -412,7 +412,7 @@
             secondary_icon_tooltip_text = tooltip;
         }
     }
-    
+
     public double get_all_breadcrumbs_width (out int breadcrumbs_count) {
         double total_width = 0.0;
         breadcrumbs_count = 0;
@@ -469,7 +469,7 @@
 
         return strpath;
     }
-    
+
     /**
      * Gets a properly escaped GLib.File for the given path
      **/
@@ -480,20 +480,20 @@
         /* Format our path so its valid */
         if (newpath == "")
             newpath = "/";
-            
+
         if (newpath[0] == '~')
             newpath = newpath.replace("~", Environment.get_home_dir ());
 
         if (!newpath.contains("://"))
             newpath = Marlin.ROOT_FS_URI + newpath;
-        
+
         newpath = newpath.replace("ssh:", "sftp:");
         newpath = GLib.Uri.escape_string (newpath, reserved_chars, true);
-        
+
         File file = File.new_for_commandline_arg (newpath);
         return file;
     }
-    
+
     /**
      * Select the breadcrumb to make a right click. This function check
      * where the user click, then, it loads a context menu with the others
@@ -503,7 +503,7 @@
      * @param event a button event to compute the coords of the new menu.
      *
      **/
-    private bool select_bread_from_coord (Gdk.EventButton event) {    
+    private bool select_bread_from_coord (Gdk.EventButton event) {
         var el = get_element_from_coordinates ((int) event.x, (int) event.y);
 
         if (el != null) {
@@ -523,7 +523,7 @@
         }
 
         return false;
-    }    
+    }
 
     public virtual string? update_breadcrumbs (string newpath, string breadpath) {
         string strloc;
@@ -654,7 +654,7 @@
             animate_old_breads ();
         } else {
             /* This is to make sure breadcrumbs are rendered properly when switching to a duplicate tab */
-            newbreads = newelements;
+            newbreads = newelements.slice (max_path, newelements.size);
             animate_new_breads ();
         }
 
@@ -748,7 +748,7 @@
             button_context_active.set_path(button_context.get_path ());
             button_context_active.set_state (Gtk.StateFlags.ACTIVE);
         }
-        
+
         base.draw (cr);
         double height = get_allocated_height ();
         double width = get_allocated_width ();
@@ -794,13 +794,13 @@
                 foreach (BreadcrumbsElement element in newbreads)
                     if (element.display)
                         x_render = element.draw(cr, x_render, margin, height_marged, button_context, this);
-                        
+
             cr.restore ();
         } else {
             if (text_completion != "") {
                 int layout_width, layout_height;
                 double text_width, text_height;
-                
+
                 cr.set_source_rgba (0, 0, 0, 0.4);
                 Pango.Layout layout = create_pango_layout (text);
                 layout.get_size (out layout_width, out layout_height);
@@ -811,7 +811,7 @@
                 Pango.cairo_show_layout (cr, layout);
             }
         }
-        
+
         return true;
     }
 

=== modified file 'src/View/Window.vala'
--- src/View/Window.vala	2014-07-13 23:14:40 +0000
+++ src/View/Window.vala	2014-07-14 05:03:50 +0000
@@ -320,7 +320,7 @@
             return null;
         }
 
-        public new void set_title(string title){
+        public new void set_title(string title) {
             this.title = title;
         }
 
@@ -339,7 +339,11 @@
             if (current_tab != null) {
                 var cur_slot = current_tab.get_active_slot ();
                 if (cur_slot != null) {
+                    /* disable animation when switching tabs */
+                    top_menu.location_bar.bread.animation_visible = false;
                     cur_slot.active();
+                    top_menu.location_bar.bread.animation_visible = true;
+
                     current_tab.update_location_state(false);
                     /* update radio action view state */
                     update_action_radio_view(current_tab.view_mode);