From 8f141bcb08417077a7b842383e8e4344ac0deb5d Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Wed, 25 May 2005 09:45:06 +0000 Subject: [PATCH] ellipsize the dockable title if it is too wide. 2005-05-25 Sven Neumann * app/widgets/gimpdockable.c: ellipsize the dockable title if it is too wide. * app/widgets/gimpstrokeeditor.c: added mnemonic for the presets combo. --- ChangeLog | 8 ++++++++ app/widgets/gimpdockable.c | 10 +++++++++- app/widgets/gimpstrokeeditor.c | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 617daad6f1..f662987ca0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-05-25 Sven Neumann + + * app/widgets/gimpdockable.c: ellipsize the dockable title if it + is too wide. + + * app/widgets/gimpstrokeeditor.c: added mnemonic for the presets + combo. + 2005-05-25 Michael Natterer * app/widgets/gimptoolbox-dnd.c: implemented dropping of pixbufs. diff --git a/app/widgets/gimpdockable.c b/app/widgets/gimpdockable.c index a545b26de2..ffa3e218e7 100644 --- a/app/widgets/gimpdockable.c +++ b/app/widgets/gimpdockable.c @@ -356,6 +356,10 @@ gimp_dockable_size_allocate (GtkWidget *widget, gdk_window_move_resize (dockable->title_window, area.x, area.y, area.width, area.height); + + if (dockable->title_layout) + pango_layout_set_width (dockable->title_layout, + PANGO_SCALE * area.width); } } @@ -515,8 +519,12 @@ gimp_dockable_expose_event (GtkWidget *widget, dockable->title_layout = gtk_widget_create_pango_layout (widget, title); - g_free (title); + + pango_layout_set_width (dockable->title_layout, + PANGO_SCALE * title_area.width); + pango_layout_set_ellipsize (dockable->title_layout, + PANGO_ELLIPSIZE_END); } pango_layout_get_pixel_size (dockable->title_layout, diff --git a/app/widgets/gimpstrokeeditor.c b/app/widgets/gimpstrokeeditor.c index 3be64ba069..43301e24e3 100644 --- a/app/widgets/gimpstrokeeditor.c +++ b/app/widgets/gimpstrokeeditor.c @@ -288,7 +288,7 @@ gimp_stroke_editor_constructor (GType type, box = gimp_enum_combo_box_new (GIMP_TYPE_DASH_PRESET); gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (box), GIMP_DASH_CUSTOM); gimp_table_attach_aligned (GTK_TABLE (table), 0, row++, - _("Dash preset:"), 0.0, 0.5, + _("Dash _preset:"), 0.0, 0.5, box, 2, FALSE); cell = g_object_new (GIMP_TYPE_CELL_RENDERER_DASHES,