nautilus r14515 - in trunk: . libnautilus-private

[cneumair svn gnome org]

Author: cneumair
Date: Fri Aug 22 13:00:48 2008
New Revision: 14515
URL: http://svn.gnome.org/viewvc/nautilus?rev=14515&view=rev

Log:
2008-08-22  Christian Neumair  <cneumair gnome org>

	* libnautilus-private/nautilus-icon-canvas-item.c
	(prepare_pango_layout_for_draw), (draw_label_text):
	Always clear text background and display entire text
	if an icon is prelit or has the keyboard focus.


Modified:
   trunk/ChangeLog
   trunk/libnautilus-private/nautilus-icon-canvas-item.c

Modified: trunk/libnautilus-private/nautilus-icon-canvas-item.c
==============================================================================
--- trunk/libnautilus-private/nautilus-icon-canvas-item.c	(original)
+++ trunk/libnautilus-private/nautilus-icon-canvas-item.c	Fri Aug 22 13:00:48 2008
@@ -1110,6 +1110,7 @@
 		pango_layout_set_height (layout, -1);
 	} else if (needs_highlight ||
 		   details->is_prelit ||
+		   details->is_highlighted_as_keyboard_focus ||
 		   details->entire_text ||
 		   container->details->label_position == NAUTILUS_ICON_LABEL_POSITION_BESIDE) {
 		/* VOODOO-TODO, cf. compute_text_rectangle() */
@@ -1319,8 +1320,9 @@
 			    is_rtl_label_beside ? text_rect.x1 - text_rect.x0 - item->details->text_dx : text_rect.x1 - text_rect.x0,
 			    text_rect.y1 - text_rect.y0);
 	} else if (!needs_highlight && !details->is_renaming &&
-		   details->text_height_for_layout != details->text_height) {
-		/* clear the underlying icons, where the text overlaps them. */
+		   (details->is_prelit ||
+		    details->is_highlighted_as_keyboard_focus)) {
+		/* clear the underlying icons, where the text or overlaps them. */
 		gdk_window_clear_area (EEL_CANVAS (container)->layout.bin_window,
 				       text_rect.x0,
 				       text_rect.y0,