callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iconview: Use gtk_adjustment_configure() instead of g_object_set()

Browse Source 
Simplifies code quite a bit apart from jsut making it more readable.
This commit is contained in:
Benjamin Otte 2011-01-05 23:14:02 +01:00
parent 3f1a65d6f5
commit aa495f00b4
1 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
gtk/gtkiconview.c
View File

@ -2644,14 +2644,6 @@ gtk_icon_view_set_hadjustment_values (GtkIconView *icon_view)
old_page_size = gtk_adjustment_get_page_size (adj); old_page_size = gtk_adjustment_get_page_size (adj);
new_upper = MAX (allocation.width, icon_view->priv->width); new_upper = MAX (allocation.width, icon_view->priv->width);
g_object_set (adj,
"lower", 0.0,
"upper", new_upper,
"page-size", (gdouble)allocation.width,
"step-increment", allocation.width * 0.1,
"page-increment", allocation.width * 0.9,
NULL);
if (gtk_widget_get_direction (GTK_WIDGET (icon_view)) == GTK_TEXT_DIR_RTL) if (gtk_widget_get_direction (GTK_WIDGET (icon_view)) == GTK_TEXT_DIR_RTL)
{ {
/* Make sure no scrolling occurs for RTL locales also (if possible) */ /* Make sure no scrolling occurs for RTL locales also (if possible) */
@ -2671,8 +2663,13 @@ gtk_icon_view_set_hadjustment_values (GtkIconView *icon_view)
else else
new_value = CLAMP (old_value, 0, new_upper - allocation.width); new_value = CLAMP (old_value, 0, new_upper - allocation.width);
if (new_value != old_value) gtk_adjustment_configure (adj,
gtk_adjustment_set_value (adj, new_value); new_value,
0.0,
new_upper,
allocation.width * 0.1,
allocation.width * 0.9,
allocation.width);
} }
static void static void
@ -2680,26 +2677,16 @@ gtk_icon_view_set_vadjustment_values (GtkIconView *icon_view)
{ {
GtkAllocation allocation; GtkAllocation allocation;
GtkAdjustment *adj = icon_view->priv->vadjustment; GtkAdjustment *adj = icon_view->priv->vadjustment;
gdouble old_value;
gdouble new_value;
gdouble new_upper;
gtk_widget_get_allocation (GTK_WIDGET (icon_view), &allocation); gtk_widget_get_allocation (GTK_WIDGET (icon_view), &allocation);
old_value = gtk_adjustment_get_value (adj); gtk_adjustment_configure (adj,
new_upper = MAX (allocation.height, icon_view->priv->height); gtk_adjustment_get_value (adj),
0.0,
g_object_set (adj, MAX (allocation.height, icon_view->priv->height),
"lower", 0.0, allocation.height * 0.1,
"upper", new_upper, allocation.height * 0.9,
"page-size", (gdouble)allocation.height, allocation.height);
"step-increment", allocation.height * 0.1,
"page-increment", allocation.height * 0.9,
NULL);
new_value = CLAMP (old_value, 0, new_upper - allocation.height);
if (new_value != old_value)
gtk_adjustment_set_value (adj, new_value);
} }
static void static void