Author: abrander
Date: 2010-12-19 21:38:16 +0100 (Sun, 19 Dec 2010)
New Revision: 3689
Modified:
trunk/src/rs-toolbox.c
Log:
Re-use the same GtkAdjustment in value_enterleaveclick() to keep both controls
synchronized.
Modified: trunk/src/rs-toolbox.c
===================================================================
--- trunk/src/rs-toolbox.c 2010-12-19 20:20:58 UTC (rev 3688)
+++ trunk/src/rs-toolbox.c 2010-12-19 20:38:16 UTC (rev 3689)
@@ -352,14 +352,6 @@
return TRUE;
}
-static void
-value_transfer_value(GtkSpinButton *spinbutton, gpointer user_data)
-{
- GtkRange *range = GTK_RANGE(user_data);
- gdouble value = gtk_spin_button_get_value(spinbutton);
- gtk_range_set_value(range, value);
-}
-
static gboolean
value_enterleaveclick(GtkWidget *widget, GdkEventCrossing *event, gpointer
user_data)
{
@@ -376,12 +368,10 @@
{
GtkRange *range = GTK_RANGE(user_data);
GtkAdjustment* adjustment =
gtk_range_get_adjustment(range);
- gdouble value = gtk_range_get_value(range);
- GtkSpinButton *spinner =
gtk_spin_button_new_with_range(gtk_adjustment_get_lower(adjustment),
- gtk_adjustment_get_upper(adjustment),
-
gtk_adjustment_get_step_increment(adjustment)/10.0);
- gtk_spin_button_set_digits(spinner, 3);
- gtk_spin_button_set_value(spinner, value);
+ GtkWidget *spinner = gtk_spin_button_new(adjustment,
+
gtk_adjustment_get_step_increment(adjustment)/10.0,
+ (gtk_adjustment_get_upper(adjustment) > 99.0) ?
0 : 3);
+
GtkWidget *popup = gtk_window_new(GTK_WINDOW_TOPLEVEL);
GtkWidget *label = gtk_label_new(_("Enter new value:"));
GtkWidget *box = gtk_hbox_new(FALSE, 10);
@@ -395,8 +385,6 @@
gtk_container_set_border_width(GTK_CONTAINER(box), 10);
gtk_container_add(GTK_CONTAINER(popup), box);
gtk_widget_show_all(popup);
-
- g_signal_connect(spinner, "value-changed",
G_CALLBACK(value_transfer_value), range);
}
default:
break;
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit