* widgets/modest-header-view.[ch], gtk/modest-main-window.c

  - make the main window resizing due to column expansion a bit less annoying

pmo-trunk-r617

diff --git a/src/gtk/modest-main-window.c b/src/gtk/modest-main-window.c
index c88cee2..3f8ab43 100644 (file)
--- a/src/gtk/modest-main-window.c
+++ b/src/gtk/modest-main-window.c
@@ -200,8 +200,9 @@ header_view_new (ModestMainWindow *self)
 
        header_view = modest_widget_factory_get_header_view (priv->widget_factory);
        modest_header_view_set_columns (header_view, columns);
+       modest_header_view_set_style (header_view,
+                                     MODEST_HEADER_VIEW_STYLE_SHOW_HEADERS);
        g_list_free (columns);
-
        return header_view;
 }
 
@@ -350,8 +351,6 @@ modest_main_window_new (ModestWidgetFactory *widget_factory,
        gtk_paned_add2 (GTK_PANED(priv->msg_paned), GTK_WIDGET(priv->msg_preview));
 
        gtk_widget_show (GTK_WIDGET(priv->header_view));
-       gtk_tree_view_columns_autosize (GTK_TREE_VIEW(priv->header_view));
-
        
        /* status bar / progress */
        status_hbox = gtk_hbox_new (FALSE, 0);
@@ -380,8 +379,7 @@ modest_main_window_new (ModestWidgetFactory *widget_factory,
 
        gtk_window_set_title (GTK_WINDOW(obj), _("Modest"));
        gtk_window_set_icon  (GTK_WINDOW(obj),
-                             modest_icon_factory_get_icon (MODEST_APP_ICON));
-       
+                             modest_icon_factory_get_icon (MODEST_APP_ICON));  
        gtk_widget_show_all (main_vbox);
 
        g_signal_connect (G_OBJECT(obj), "delete-event",

diff --git a/src/widgets/modest-header-view.c b/src/widgets/modest-header-view.c
index 2c6af0f..6b174d8 100644 (file)
--- a/src/widgets/modest-header-view.c
+++ b/src/widgets/modest-header-view.c
@@ -283,7 +283,7 @@ get_new_column (const gchar *name, GtkCellRenderer *renderer,
        GtkTreeViewColumn *column;
 
        column =  gtk_tree_view_column_new_with_attributes(name, renderer, NULL);
-       gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
+       gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_GROW_ONLY);
 
        gtk_tree_view_column_set_resizable (column, resizable);
        if (resizable)
@@ -297,6 +297,7 @@ get_new_column (const gchar *name, GtkCellRenderer *renderer,
 
        gtk_tree_view_column_set_sort_indicator (column, FALSE);
        gtk_tree_view_column_set_reorderable (column, TRUE);
+       gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
 
        if (cell_data_func)
                gtk_tree_view_column_set_cell_data_func(column, renderer, cell_data_func,
@@ -607,7 +608,8 @@ modest_header_view_new (TnyFolder *folder, const GList *columns,
                
        /* all cols */
        gtk_tree_view_columns_autosize (GTK_TREE_VIEW(obj));
-       
+       gtk_tree_view_set_fixed_height_mode (GTK_TREE_VIEW(obj),TRUE);
+
        gtk_tree_view_set_rules_hint (GTK_TREE_VIEW(obj),
                                      TRUE); /* alternating row colors */
 

diff --git a/src/widgets/modest-header-view.h b/src/widgets/modest-header-view.h
index 40203b2..17e9cd4 100644 (file)
--- a/src/widgets/modest-header-view.h
+++ b/src/widgets/modest-header-view.h
@@ -82,7 +82,7 @@ typedef enum _ModestHeaderViewColumn {
  */
 typedef enum _ModestHeaderViewStyle {
        MODEST_HEADER_VIEW_STYLE_SHOW_HEADERS = 0x01,
-       MODEST_HEADER_VIEW_STYLE_NORMAL = 0x02,
+       MODEST_HEADER_VIEW_STYLE_NORMAL       = 0x02,
 } ModestHeaderViewStyle;
 
 typedef enum _ModestItemType {