diff options
| author | Vincent Untz <vincent@vuntz.net> | 2005-02-28 07:28:20 +0000 |
|---|---|---|
| committer | Vincent Untz <vuntz@src.gnome.org> | 2005-02-28 07:28:20 +0000 |
| commit | 903660bbdb555452b6425c36d4f6ab0798037ce8 (patch) | |
| tree | 2683691ed7a4778a531cb0bf56a7ff72be10e60f | |
| parent | 57d62aaccc538ca7ec74e0dc7b01c009f0ca2a81 (diff) | |
| download | libwnck-903660bbdb555452b6425c36d4f6ab0798037ce8.tar.gz | |
use GtkHBox instead of GtkTable, set a max width in characters for the
2005-02-26 Vincent Untz <vincent@vuntz.net>
* libwnck/tasklist.c: (wnck_task_create_widgets): use GtkHBox instead
of GtkTable, set a max width in characters for the label so that it
requests a reasonable size.
Fix bug #160977
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | libwnck/tasklist.c | 28 |
2 files changed, 17 insertions, 18 deletions
@@ -1,5 +1,12 @@ 2005-02-26 Vincent Untz <vincent@vuntz.net> + * libwnck/tasklist.c: (wnck_task_create_widgets): use GtkHBox instead + of GtkTable, set a max width in characters for the label so that it + requests a reasonable size. + Fix bug #160977 + +2005-02-26 Vincent Untz <vincent@vuntz.net> + * libwnck/application.c: (_wnck_application_destroy): plug leak 2005-02-20 Elijah Newren <newren@gmail.com> diff --git a/libwnck/tasklist.c b/libwnck/tasklist.c index 8a85b5f..0461a6f 100644 --- a/libwnck/tasklist.c +++ b/libwnck/tasklist.c @@ -62,6 +62,8 @@ typedef struct _WnckTaskClass WnckTaskClass; #define DEFAULT_WIDTH 1 #define DEFAULT_HEIGHT 48 +#define MAX_WIDTH_CHARS 250 + #define N_SCREEN_CONNECTIONS 5 #define POINT_IN_RECT(xcoord, ycoord, rect) \ @@ -2620,11 +2622,10 @@ wnck_task_button_press_event (GtkWidget *widget, return FALSE; } - static void wnck_task_create_widgets (WnckTask *task) { - GtkWidget *table; + GtkWidget *hbox; GdkPixbuf *pixbuf; char *text; static GQuark disable_sound_quark = 0; @@ -2647,7 +2648,7 @@ wnck_task_create_widgets (WnckTask *task) gtk_drag_dest_set (GTK_WIDGET(task->button), 0, NULL, 0, 0); - table = gtk_table_new (1, 2, FALSE); + hbox = gtk_hbox_new (FALSE, 0); pixbuf = wnck_task_get_icon (task); if (pixbuf) @@ -2665,26 +2666,17 @@ wnck_task_create_widgets (WnckTask *task) gtk_misc_set_alignment (GTK_MISC (task->label), 0.0, 0.5); gtk_label_set_ellipsize (GTK_LABEL (task->label), PANGO_ELLIPSIZE_END); + gtk_label_set_max_width_chars (GTK_LABEL (task->label), MAX_WIDTH_CHARS); if (wnck_task_get_demands_attention (task)) make_gtk_label_bold ((GTK_LABEL (task->label))); gtk_widget_show (task->label); - gtk_table_attach (GTK_TABLE (table), - task->image, - 0, 1, - 0, 1, - 0, GTK_EXPAND, - 4, 0); - gtk_table_attach (GTK_TABLE (table), - task->label, - 1, 2, - 0, 1, - GTK_FILL | GTK_EXPAND, GTK_EXPAND, - 2, 0); - - gtk_container_add (GTK_CONTAINER (task->button), table); - gtk_widget_show (table); + gtk_box_pack_start (GTK_BOX (hbox), task->image, FALSE, FALSE, 4); + gtk_box_pack_start (GTK_BOX (hbox), task->label, TRUE, TRUE, 2); + + gtk_container_add (GTK_CONTAINER (task->button), hbox); + gtk_widget_show (hbox); gtk_tooltips_set_tip (task->tasklist->priv->tooltips, task->button, text, NULL); g_free (text); |