AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-18 09:00:34 +00:00
Code Issues Projects Releases Wiki Activity

gtk: fix tool palette scroll adjustment setting

Browse Source 
Create a new adjustment if there was *no* adjustment passed in, not
the other way around. Also remove unused function
gtk_tool_palette_set_adjustment().
This commit is contained in:
Michael Natterer 2010-10-22 17:01:58 +02:00
parent 6d2e4c26bd
commit 8e7aed9489
1 changed files with 2 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
gtk/gtktoolpalette.c
View File

@ -750,50 +750,6 @@ gtk_tool_palette_adjustment_value_changed (GtkAdjustment *adjustment,
gtk_tool_palette_size_allocate (widget, &allocation);
}
static void
gtk_tool_palette_set_adjustment (GtkToolPalette *palette,
GtkOrientation orientation,
GtkAdjustment *adjustment)
{
GtkAdjustment **adj_ptr;
if (orientation == GTK_ORIENTATION_HORIZONTAL)
{
if (adjustment && palette->priv->hadjustment == adjustment)
return;
adj_ptr = &palette->priv->hadjustment;
}
else
{
if (adjustment && palette->priv->vadjustment == adjustment)
return;
adj_ptr = &palette->priv->vadjustment;
}
/* Disconnect handler */
if (*adj_ptr)
{
g_signal_handlers_disconnect_by_func (*adj_ptr,
gtk_tool_palette_adjustment_value_changed,
palette);
g_object_unref (*adj_ptr);
}
/* Ensure adjustment */
if (!adjustment)
adjustment = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 0.0,
0.0, 0.0, 0.0));
/* Connect signal handler */
g_signal_connect (adjustment, "value-changed",
G_CALLBACK (gtk_tool_palette_adjustment_value_changed),
palette);
*adj_ptr = g_object_ref_sink (adjustment);
/* FIXME: Adjustment should probably have it's values updated now */
}
static void
gtk_tool_palette_add (GtkContainer *container,
GtkWidget *child)
@ -1977,7 +1933,7 @@ gtk_tool_palette_set_hadjustment (GtkToolPalette *palette,
g_object_unref (priv->hadjustment);
}
if (adjustment != NULL)
if (adjustment == NULL)
adjustment = gtk_adjustment_new (0.0, 0.0, 0.0,
0.0, 0.0, 0.0);
@ -2026,7 +1982,7 @@ gtk_tool_palette_set_vadjustment (GtkToolPalette *palette,
g_object_unref (priv->vadjustment);
}
if (adjustment != NULL)
if (adjustment == NULL)
adjustment = gtk_adjustment_new (0.0, 0.0, 0.0,
0.0, 0.0, 0.0);