From cc556dad8a2a376dca1c9fed28d3c29d3945b20b Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Sun, 16 Jan 2011 13:51:36 +0200 Subject: [PATCH] * mu-msg-header-view, mu-msg-view: put headers in a scrolled win, so overly long lists don't expand the whole msg-view too much. this is not the final solution, but it's better than what was there --- widgets/mu-msg-header-view.c | 10 +++------- widgets/mu-msg-view.c | 13 ++++++++++++- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/widgets/mu-msg-header-view.c b/widgets/mu-msg-header-view.c index bdf90ae9..9a054eeb 100644 --- a/widgets/mu-msg-header-view.c +++ b/widgets/mu-msg-header-view.c @@ -101,9 +101,6 @@ get_label (const gchar *txt, gboolean istitle) } else { gtk_label_set_selectable (GTK_LABEL (label), TRUE); gtk_label_set_text (GTK_LABEL(label), txt ? txt : ""); - /* gtk_label_set_line_wrap_mode (GTK_LABEL (label), PANGO_WRAP_WORD_CHAR); */ - /* gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); */ - /* gtk_label_set_ellipsize (GTK_LABEL (label), TRUE); */ gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT); } @@ -127,9 +124,9 @@ add_row (GtkWidget *table, guint row, const char* fieldname, const char *value, GTK_TABLE(table), al, 0, 1, row, row + 1, GTK_FILL, 0, 0, 0); - al = gtk_alignment_new (0.0, 0.0, 0.0, 0.0); + al = gtk_alignment_new (0.0, 1.0, 0.0, 0.0); - label = get_label (value, FALSE); + label = get_label (value, FALSE); gtk_container_add (GTK_CONTAINER (al), label); gtk_table_attach ( @@ -167,7 +164,6 @@ get_table (MuMsg *msg) return table; } - void mu_msg_header_view_set_message (MuMsgHeaderView *self, MuMsg *msg) { @@ -181,7 +177,7 @@ mu_msg_header_view_set_message (MuMsgHeaderView *self, MuMsg *msg) if (msg) { self->_priv->_table = get_table (msg); gtk_box_pack_start (GTK_BOX(self), self->_priv->_table, - TRUE, FALSE, 2); + FALSE, FALSE, 2); gtk_widget_show_all (self->_priv->_table); } } diff --git a/widgets/mu-msg-view.c b/widgets/mu-msg-view.c index 6fd1765a..56d4dc39 100644 --- a/widgets/mu-msg-view.c +++ b/widgets/mu-msg-view.c @@ -89,7 +89,18 @@ on_attach_activated (MuMsgView *self, guint partnum, MuMsg *msg) static GtkWidget* get_header_widget (MuMsgView *self) { - return self->_priv->_headers = mu_msg_header_view_new (); + GtkWidget *scrolledwin; + + self->_priv->_headers = mu_msg_header_view_new (); + + scrolledwin = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy ( + GTK_SCROLLED_WINDOW(scrolledwin), + GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_add_with_viewport + (GTK_SCROLLED_WINDOW(scrolledwin), self->_priv->_headers); + + return scrolledwin; } static void