diff options
| author | Dave Camp <dave@ximian.com> | 2003-07-05 15:30:04 +0000 |
|---|---|---|
| committer | Dave Camp <campd@src.gnome.org> | 2003-07-05 15:30:04 +0000 |
| commit | 7e112b1dbf48e13dfd7ac302879fbf0a4416dfe8 (patch) | |
| tree | 091016a0559fbd77d3f623e47324099ec86afa56 | |
| parent | a79bd6b2377582897b38234a4b6a32cb2058c5ae (diff) | |
| download | nautilus-7e112b1dbf48e13dfd7ac302879fbf0a4416dfe8.tar.gz | |
Don't add LABEL_LINE_SPACING to the total height if there is no additional
2003-07-05 Dave Camp <dave@ximian.com>
* libnautilus-private/nautilus-icon-canvas-item.c
(draw_or_measure_label_text): Don't add LABEL_LINE_SPACING to the
total height if there is no additional text.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-icon-canvas-item.c | 7 |
2 files changed, 12 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2003-07-05 Dave Camp <dave@ximian.com> + + * libnautilus-private/nautilus-icon-canvas-item.c + (draw_or_measure_label_text): Don't add LABEL_LINE_SPACING to the + total height if there is no additional text. + 2003-07-02 Jordi Mallach <jordi@sindominio.net> * nautilus.desktop.in: Add Encoding and fixed Terminal entries. diff --git a/libnautilus-private/nautilus-icon-canvas-item.c b/libnautilus-private/nautilus-icon-canvas-item.c index 69ec3c1db..146f939fe 100644 --- a/libnautilus-private/nautilus-icon-canvas-item.c +++ b/libnautilus-private/nautilus-icon-canvas-item.c @@ -862,7 +862,12 @@ draw_or_measure_label_text (NautilusIconCanvasItem *item, } details->text_width = MAX (editable_width, additional_width); - details->text_height = editable_height + LABEL_LINE_SPACING + additional_height; + + if (have_additional) { + details->text_height = editable_height + LABEL_LINE_SPACING + additional_height; + } else { + details->text_height = editable_height; + } if (ANTIALIAS_SELECTION_RECTANGLE) { /* add some extra space for highlighting even when we don't highlight so things won't move */ |