dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app: set GimpHandleBar's lower and upper bounds in the adjustment callback 

so it keeps working correctly when the adjustments get reconfigured.
This commit is contained in:
Michael Natterer 2012-06-07 21:40:35 +02:00
parent 1d40b5927a
commit 63ff0fc77b
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
app/widgets/gimphandlebar.c
View File

@ -328,28 +328,21 @@ gimp_handle_bar_set_adjustment (GimpHandleBar *bar,
bar->slider_adj[handle_no] = NULL;
}
bar->slider_adj[handle_no] = adjustment;
bar->slider_adj[handle_no] = adjustment;
if (bar->slider_adj[handle_no])
{
g_object_ref (bar->slider_adj[handle_no]);
if (bar->slider_adj[handle_no])
{
g_object_ref (bar->slider_adj[handle_no]);
g_signal_connect (bar->slider_adj[handle_no], "value-changed",
G_CALLBACK (gimp_handle_bar_adjustment_changed),
bar);
}
g_signal_connect (bar->slider_adj[handle_no], "value-changed",
G_CALLBACK (gimp_handle_bar_adjustment_changed),
bar);
g_signal_connect (bar->slider_adj[handle_no], "changed",
G_CALLBACK (gimp_handle_bar_adjustment_changed),
bar);
}
if (bar->slider_adj[0])
bar->lower = gtk_adjustment_get_lower (bar->slider_adj[0]);
else
bar->lower = gtk_adjustment_get_lower (bar->slider_adj[handle_no]);
if (bar->slider_adj[2])
bar->upper = gtk_adjustment_get_upper (bar->slider_adj[2]);
else
bar->upper = gtk_adjustment_get_upper (bar->slider_adj[handle_no]);
gimp_handle_bar_adjustment_changed (bar->slider_adj[handle_no], bar);
gimp_handle_bar_adjustment_changed (bar->slider_adj[handle_no], bar);
}
@ -359,5 +352,11 @@ static void
gimp_handle_bar_adjustment_changed (GtkAdjustment *adjustment,
GimpHandleBar *bar)
{
if (bar->slider_adj[0])
bar->lower = gtk_adjustment_get_lower (bar->slider_adj[0]);
if (bar->slider_adj[2])
bar->upper = gtk_adjustment_get_upper (bar->slider_adj[2]);
gtk_widget_queue_draw (GTK_WIDGET (bar));
}