summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Hertzfeld <andy@src.gnome.org>2000-09-26 00:07:49 +0000
committerAndy Hertzfeld <andy@src.gnome.org>2000-09-26 00:07:49 +0000
commit38a590615d4d5a5d7ff1c1770d26bce2268db021 (patch)
tree063937ecb0bd1d9880c685918a8567522dc8fe4a
parent274f7511c772ebf7b42a3b1b3f2d082454aa9004 (diff)
downloadnautilus-38a590615d4d5a5d7ff1c1770d26bce2268db021.tar.gz
tweaked the new, semi-transparent selection highlighting a bit by
tweaked the new, semi-transparent selection highlighting a bit by lightening the info text color and enlarging the selection area a little.
-rw-r--r--ChangeLog8
-rw-r--r--libnautilus-extensions/nautilus-icon-canvas-item.c8
-rw-r--r--libnautilus-private/nautilus-icon-canvas-item.c8
3 files changed, 18 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 5ff956b31..2bb112e19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-09-25 Andy Hertzfeld <andy@eazel.com>
+
+ * libnautilus-extensions/nautilus-icon-canvas-item.c:
+ (draw_or_measure_label_text_aa):
+ tweaked the new, semi-transparent selection highlighting
+ a bit by lightening the info text color and enlarging
+ the selection area a little.
+
2000-09-25 Gene Z. Ragan <gzr@eazel.com>
* libnautilus-extensions/nautilus-icon-canvas-item.c:
diff --git a/libnautilus-extensions/nautilus-icon-canvas-item.c b/libnautilus-extensions/nautilus-icon-canvas-item.c
index b8f3c3c44..af0f01db1 100644
--- a/libnautilus-extensions/nautilus-icon-canvas-item.c
+++ b/libnautilus-extensions/nautilus-icon-canvas-item.c
@@ -132,7 +132,7 @@ static guint signals[LAST_SIGNAL];
static guint32 highlight_background_color = NAUTILUS_RGBA_COLOR_PACK (0x00, 0x00, 0x00, 0xFF);
static guint32 highlight_text_color = NAUTILUS_RGBA_COLOR_PACK (0xFF, 0xFF, 0xFF, 0xFF);
-static guint32 highlight_text_info_color = NAUTILUS_RGBA_COLOR_PACK (0xAA, 0xAA, 0xAA, 0xFF);
+static guint32 highlight_text_info_color = NAUTILUS_RGBA_COLOR_PACK (0xCC, 0xCC, 0xCC, 0xFF);
/* GtkObject */
static void nautilus_icon_canvas_item_initialize_class (NautilusIconCanvasItemClass *class);
@@ -1504,6 +1504,7 @@ draw_or_measure_label_text_aa (NautilusIconCanvasItem *item,
/* draw the shadow in black */
if (needs_highlight) {
+ icon_bottom += 2; /* leave some space for selection frame */
nautilus_text_layout_paint (icon_text_layout,
destination_pixbuf,
text_left + 2,
@@ -1545,9 +1546,10 @@ draw_or_measure_label_text_aa (NautilusIconCanvasItem *item,
}
g_strfreev (pieces);
+ /* add some extra space for highlighting */
if (needs_highlight) {
- height_so_far += 2; /* extra slop for nicer highlighting */
- width_so_far += 4; /* account for emboldening, plus extra to make it look nicer */
+ height_so_far += 6; /* extra slop for nicer highlighting */
+ width_so_far += 8; /* account for emboldening, plus extra to make it look nicer */
}
if (destination_pixbuf != NULL) {
diff --git a/libnautilus-private/nautilus-icon-canvas-item.c b/libnautilus-private/nautilus-icon-canvas-item.c
index b8f3c3c44..af0f01db1 100644
--- a/libnautilus-private/nautilus-icon-canvas-item.c
+++ b/libnautilus-private/nautilus-icon-canvas-item.c
@@ -132,7 +132,7 @@ static guint signals[LAST_SIGNAL];
static guint32 highlight_background_color = NAUTILUS_RGBA_COLOR_PACK (0x00, 0x00, 0x00, 0xFF);
static guint32 highlight_text_color = NAUTILUS_RGBA_COLOR_PACK (0xFF, 0xFF, 0xFF, 0xFF);
-static guint32 highlight_text_info_color = NAUTILUS_RGBA_COLOR_PACK (0xAA, 0xAA, 0xAA, 0xFF);
+static guint32 highlight_text_info_color = NAUTILUS_RGBA_COLOR_PACK (0xCC, 0xCC, 0xCC, 0xFF);
/* GtkObject */
static void nautilus_icon_canvas_item_initialize_class (NautilusIconCanvasItemClass *class);
@@ -1504,6 +1504,7 @@ draw_or_measure_label_text_aa (NautilusIconCanvasItem *item,
/* draw the shadow in black */
if (needs_highlight) {
+ icon_bottom += 2; /* leave some space for selection frame */
nautilus_text_layout_paint (icon_text_layout,
destination_pixbuf,
text_left + 2,
@@ -1545,9 +1546,10 @@ draw_or_measure_label_text_aa (NautilusIconCanvasItem *item,
}
g_strfreev (pieces);
+ /* add some extra space for highlighting */
if (needs_highlight) {
- height_so_far += 2; /* extra slop for nicer highlighting */
- width_so_far += 4; /* account for emboldening, plus extra to make it look nicer */
+ height_so_far += 6; /* extra slop for nicer highlighting */
+ width_so_far += 8; /* account for emboldening, plus extra to make it look nicer */
}
if (destination_pixbuf != NULL) {