0
@@ -522,10 +522,10 @@ prepend_row_layout (TidyListView     *view,
0
       clutter_actor_set_widthu (cell, column_width);
0
       clutter_actor_show (cell);
0
 
0
+      cell_height = MAX (cell_height, clutter_actor_get_heightu (cell));
0
+
0
       x_offset += column_width;
0
       x_offset += CLUTTER_UNITS_FROM_DEVICE (h_padding);
0
-
0
-      cell_height = MAX (cell_height, clutter_actor_get_heightu (cell));
0
     }
0
 
0
   row_info->width = x_offset;
0
@@ -900,7 +900,7 @@ on_row_changed (ClutterModel     *model,
0
 
0
   row = clutter_model_iter_get_row (iter);
0
   row_info = g_list_nth_data (priv->rows, row);
0
-  
0
+
0
   if (row_info)
0
     {
0
       ClutterUnit x_offset;
0
@@ -930,6 +930,10 @@ on_row_changed (ClutterModel     *model,
0
           if (row_info->cells->len <= i)
0
             break;
0
 
0
+          /* Replace cell */
0
+          old_cell = (ClutterActor *) g_ptr_array_index (row_info->cells, i);
0
+          clutter_actor_hide (old_cell);
0
+
0
           model_id = tidy_list_column_get_model_index (column);
0
 
0
           if (model_id == clutter_model_get_sorting_column (priv->model))
0
@@ -954,11 +958,7 @@ on_row_changed (ClutterModel     *model,
0
                                                     state, &size,
0
                                                     row, i);
0
           g_value_unset (&value);
0
-          
0
-          /* Replace cell */
0
-          old_cell = (ClutterActor *) g_ptr_array_index (row_info->cells, i);
0
-          clutter_actor_hide (old_cell);
0
-          
0
+
0
           g_ptr_array_index (row_info->cells, i) = cell;
0
           clutter_actor_set_parent (cell, actor);
0
           clutter_actor_set_positionu (cell, x_offset, row_info->y_offset);