[nautilus] Fix display sizing of name column



commit d228c0e72103d2389bdcf0206b02bf36c7b049d1
Author: William Jon McCann <jmccann redhat com>
Date:   Mon May 28 07:54:41 2012 -0400

    Fix display sizing of name column
    
    https://bugzilla.gnome.org/show_bug.cgi?id=676898

 libnautilus-private/Makefile.am                    |    2 -
 .../nautilus-cell-renderer-text-ellipsized.c       |   76 --------------------
 .../nautilus-cell-renderer-text-ellipsized.h       |   59 ---------------
 src/nautilus-list-view.c                           |   10 ++-
 4 files changed, 6 insertions(+), 141 deletions(-)
---
diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am
index 8c7c94d..28719cd 100644
--- a/libnautilus-private/Makefile.am
+++ b/libnautilus-private/Makefile.am
@@ -61,8 +61,6 @@ libnautilus_private_la_LIBADD =		\
 libnautilus_private_la_SOURCES = \
 	nautilus-bookmark.c \
 	nautilus-bookmark.h \
-	nautilus-cell-renderer-text-ellipsized.c \
-	nautilus-cell-renderer-text-ellipsized.h \
 	nautilus-clipboard-monitor.c \
 	nautilus-clipboard-monitor.h \
 	nautilus-clipboard.c \
diff --git a/src/nautilus-list-view.c b/src/nautilus-list-view.c
index 5b9f396..662f2fa 100644
--- a/src/nautilus-list-view.c
+++ b/src/nautilus-list-view.c
@@ -57,7 +57,6 @@
 #include <libnautilus-private/nautilus-module.h>
 #include <libnautilus-private/nautilus-tree-view-drag-dest.h>
 #include <libnautilus-private/nautilus-clipboard.h>
-#include <libnautilus-private/nautilus-cell-renderer-text-ellipsized.h>
 
 #define DEBUG_FLAG NAUTILUS_DEBUG_LIST_VIEW
 #include <libnautilus-private/nautilus-debug.h>
@@ -1666,15 +1665,18 @@ create_and_set_up_tree_view (NautilusListView *view)
 			gtk_tree_view_column_set_sort_column_id (view->details->file_name_column, column_num);
 			gtk_tree_view_column_set_title (view->details->file_name_column, _("Name"));
 			gtk_tree_view_column_set_resizable (view->details->file_name_column, TRUE);
-			
+			gtk_tree_view_column_set_expand (view->details->file_name_column, TRUE);
+
 			gtk_tree_view_column_pack_start (view->details->file_name_column, cell, FALSE);
 			gtk_tree_view_column_set_attributes (view->details->file_name_column,
 							     cell,
 							     "pixbuf", NAUTILUS_LIST_MODEL_SMALLEST_ICON_COLUMN,
 							     NULL);
 			
-			cell = nautilus_cell_renderer_text_ellipsized_new ();
+			cell = gtk_cell_renderer_text_new ();
 			view->details->file_name_cell = (GtkCellRendererText *)cell;
+			g_object_set (cell, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+
 			g_signal_connect (cell, "edited", G_CALLBACK (cell_renderer_edited), view);
 			g_signal_connect (cell, "editing-canceled", G_CALLBACK (cell_renderer_editing_canceled), view);
 			g_signal_connect (cell, "editing-started", G_CALLBACK (cell_renderer_editing_started_cb), view);
@@ -1683,7 +1685,7 @@ create_and_set_up_tree_view (NautilusListView *view)
 			gtk_tree_view_column_set_cell_data_func (view->details->file_name_column, cell,
 								 (GtkTreeCellDataFunc) filename_cell_data_func,
 								 view, NULL);
-		} else {		
+		} else {
 			cell = gtk_cell_renderer_text_new ();
 			g_object_set (cell, "xalign", xalign, NULL);
 			view->details->cells = g_list_append (view->details->cells,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]