[nautilus] icon-container: don't use eel helper to set adjustment values
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] icon-container: don't use eel helper to set adjustment values
- Date: Mon, 1 Nov 2010 16:41:20 +0000 (UTC)
commit 3a9c6cd783507cc2fbd0a838cd6710f74e7f17dd
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Mon Nov 1 17:40:21 2010 +0100
icon-container: don't use eel helper to set adjustment values
libnautilus-private/nautilus-icon-container.c | 24 +++++++++---------------
1 files changed, 9 insertions(+), 15 deletions(-)
---
diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c
index 401744e..c404115 100644
--- a/libnautilus-private/nautilus-icon-container.c
+++ b/libnautilus-private/nautilus-icon-container.c
@@ -569,8 +569,8 @@ nautilus_icon_container_scroll (NautilusIconContainer *container,
old_h_value = gtk_adjustment_get_value (hadj);
old_v_value = gtk_adjustment_get_value (vadj);
- eel_gtk_adjustment_set_value (hadj, gtk_adjustment_get_value (hadj) + delta_x);
- eel_gtk_adjustment_set_value (vadj, gtk_adjustment_get_value (vadj) + delta_y);
+ gtk_adjustment_set_value (hadj, gtk_adjustment_get_value (hadj) + delta_x);
+ gtk_adjustment_set_value (vadj, gtk_adjustment_get_value (vadj) + delta_y);
/* return TRUE if we did scroll */
return gtk_adjustment_get_value (hadj) != old_h_value || gtk_adjustment_get_value (vadj) != old_v_value;
@@ -722,16 +722,16 @@ reveal_icon (NautilusIconContainer *container,
item_get_canvas_bounds (EEL_CANVAS_ITEM (icon->item), &bounds, TRUE);
}
if (bounds.y0 < gtk_adjustment_get_value (vadj)) {
- eel_gtk_adjustment_set_value (vadj, bounds.y0);
+ gtk_adjustment_set_value (vadj, bounds.y0);
} else if (bounds.y1 > gtk_adjustment_get_value (vadj) + allocation.height) {
- eel_gtk_adjustment_set_value
+ gtk_adjustment_set_value
(vadj, bounds.y1 - allocation.height);
}
if (bounds.x0 < gtk_adjustment_get_value (hadj)) {
- eel_gtk_adjustment_set_value (hadj, bounds.x0);
+ gtk_adjustment_set_value (hadj, bounds.x0);
} else if (bounds.x1 > gtk_adjustment_get_value (hadj) + allocation.width) {
- eel_gtk_adjustment_set_value
+ gtk_adjustment_set_value
(hadj, bounds.x1 - allocation.width);
}
}
@@ -1130,12 +1130,6 @@ nautilus_icon_container_update_scroll_region (NautilusIconContainer *container)
gtk_adjustment_set_step_increment (vadj, step_increment);
gtk_adjustment_changed (vadj);
}
-
- /* Now that we have a new scroll region, clamp the
- * adjustments so we are within the valid scroll area.
- */
- eel_gtk_adjustment_clamp_value (hadj);
- eel_gtk_adjustment_clamp_value (vadj);
}
static int
@@ -6671,12 +6665,12 @@ nautilus_icon_container_scroll_to_icon (NautilusIconContainer *container,
if (nautilus_icon_container_is_layout_vertical (container)) {
if (nautilus_icon_container_is_layout_rtl (container)) {
- eel_gtk_adjustment_set_value (hadj, bounds.x1 - allocation.width);
+ gtk_adjustment_set_value (hadj, bounds.x1 - allocation.width);
} else {
- eel_gtk_adjustment_set_value (hadj, bounds.x0);
+ gtk_adjustment_set_value (hadj, bounds.x0);
}
} else {
- eel_gtk_adjustment_set_value (vadj, bounds.y0);
+ gtk_adjustment_set_value (vadj, bounds.y0);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]