[nautilus] selection-canvas-item: make fade-out time configurable
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] selection-canvas-item: make fade-out time configurable
- Date: Thu, 17 Feb 2011 16:27:51 +0000 (UTC)
commit 42f53017794f288a7c8709b297f0f6de1c368e94
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Fri Feb 11 10:13:14 2011 -0500
selection-canvas-item: make fade-out time configurable
libnautilus-private/nautilus-icon-container.c | 2 +-
.../nautilus-selection-canvas-item.c | 6 ++++--
.../nautilus-selection-canvas-item.h | 3 ++-
3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c
index b445734..638af7f 100644
--- a/libnautilus-private/nautilus-icon-container.c
+++ b/libnautilus-private/nautilus-icon-container.c
@@ -2723,7 +2723,7 @@ stop_rubberbanding (NautilusIconContainer *container,
/* Destroy this canvas item; the parent will unref it. */
eel_canvas_item_ungrab (band_info->selection_rectangle, time);
- nautilus_selection_canvas_item_fade_out (NAUTILUS_SELECTION_CANVAS_ITEM (band_info->selection_rectangle));
+ nautilus_selection_canvas_item_fade_out (NAUTILUS_SELECTION_CANVAS_ITEM (band_info->selection_rectangle), 150);
band_info->selection_rectangle = NULL;
/* if only one item has been selected, use it as range
diff --git a/libnautilus-private/nautilus-selection-canvas-item.c b/libnautilus-private/nautilus-selection-canvas-item.c
index f57d0a1..ccc42f7 100644
--- a/libnautilus-private/nautilus-selection-canvas-item.c
+++ b/libnautilus-private/nautilus-selection-canvas-item.c
@@ -461,7 +461,8 @@ fade_and_request_redraw (gpointer user_data)
}
void
-nautilus_selection_canvas_item_fade_out (NautilusSelectionCanvasItem *self)
+nautilus_selection_canvas_item_fade_out (NautilusSelectionCanvasItem *self,
+ guint transition_time)
{
self->priv->fade_out_fill_alpha = self->priv->fill_color.alpha;
self->priv->fade_out_outline_alpha = self->priv->outline_color.alpha;
@@ -470,7 +471,8 @@ nautilus_selection_canvas_item_fade_out (NautilusSelectionCanvasItem *self)
self->priv->fade_out_outline_delta = self->priv->fade_out_outline_alpha / FADE_OUT_STEPS;
self->priv->fade_out_handler_id =
- g_timeout_add (FADE_OUT_SPEED, fade_and_request_redraw, self);
+ g_timeout_add ((guint) (transition_time / FADE_OUT_STEPS),
+ fade_and_request_redraw, self);
}
static void
diff --git a/libnautilus-private/nautilus-selection-canvas-item.h b/libnautilus-private/nautilus-selection-canvas-item.h
index 2d70b61..28a467e 100644
--- a/libnautilus-private/nautilus-selection-canvas-item.h
+++ b/libnautilus-private/nautilus-selection-canvas-item.h
@@ -60,7 +60,8 @@ struct _NautilusSelectionCanvasItemClass {
/* GObject */
GType nautilus_selection_canvas_item_get_type (void);
-void nautilus_selection_canvas_item_fade_out (NautilusSelectionCanvasItem *self);
+void nautilus_selection_canvas_item_fade_out (NautilusSelectionCanvasItem *self,
+ guint transition_time);
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]