From 75b970f7accc2498289ea646b16d6f412efd1912 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Thu, 3 Jan 2013 22:41:07 -0800 Subject: Intercept all events to the GF fields in the property dialog This seems like a strange way to capture the FOCUS_CHANGE event, but manually trying to register a callback for it fails. Yet registering a callback for every event and then filtering for FOCUS_CHANGE in the callback works. Go figure. But with this commit you can actually change the GF settings in the preferences dialog and once you tab out of the entry field the change gets immediately applied - nice to play with the effects of changing GF values. Signed-off-by: Dirk Hohndel --- gtk-gui.c | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) (limited to 'gtk-gui.c') diff --git a/gtk-gui.c b/gtk-gui.c index 0540de266..aad2c6f34 100644 --- a/gtk-gui.c +++ b/gtk-gui.c @@ -516,22 +516,30 @@ OPTIONCALLBACK(calc_ceiling_3m_toggle, prefs.calc_ceiling_3m_incr) OPTIONCALLBACK(force_toggle, force_download) OPTIONCALLBACK(prefer_dl_toggle, prefer_downloaded) -static void gflow_edit(GtkWidget *w, gpointer _data) +static gboolean gflow_edit(GtkWidget *w, GdkEvent *event, gpointer _data) { double gflow; const char *buf; - buf = gtk_entry_get_text(GTK_ENTRY(w)); - sscanf(buf, "%lf", &gflow); - set_gf(prefs.gflow, -1.0); + if (event->type == GDK_FOCUS_CHANGE) { + buf = gtk_entry_get_text(GTK_ENTRY(w)); + sscanf(buf, "%lf", &gflow); + set_gf(gflow / 100.0, -1.0); + update_screen(); + } + return FALSE; } -static void gfhigh_edit(GtkWidget *w, gpointer _data) +static gboolean gfhigh_edit(GtkWidget *w, GdkEvent *event, gpointer _data) { double gfhigh; const char *buf; - buf = gtk_entry_get_text(GTK_ENTRY(w)); - sscanf(buf, "%lf", &gfhigh); - set_gf(-1.0, prefs.gfhigh); + if (event->type == GDK_FOCUS_CHANGE) { + buf = gtk_entry_get_text(GTK_ENTRY(w)); + sscanf(buf, "%lf", &gfhigh); + set_gf(-1.0, gfhigh / 100.0); + update_screen(); + } + return FALSE; } static void event_toggle(GtkWidget *w, gpointer _data) @@ -816,7 +824,8 @@ static void preferences_dialog(GtkWidget *w, gpointer data) snprintf(threshold_text, sizeof(threshold_text), "%.0f", prefs.gflow); gtk_entry_set_text(GTK_ENTRY(entry_gflow), threshold_text); gtk_container_add(GTK_CONTAINER(frame), entry_gflow); - g_signal_connect(G_OBJECT(entry_gflow), "changed", G_CALLBACK(gflow_edit), NULL); + gtk_widget_add_events(entry_gflow, GDK_FOCUS_CHANGE_MASK); + g_signal_connect(G_OBJECT(entry_gflow), "event", G_CALLBACK(gflow_edit), NULL); frame = gtk_frame_new(_("GFhigh")); gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 6); @@ -825,7 +834,8 @@ static void preferences_dialog(GtkWidget *w, gpointer data) snprintf(threshold_text, sizeof(threshold_text), "%.0f", prefs.gfhigh); gtk_entry_set_text(GTK_ENTRY(entry_gfhigh), threshold_text); gtk_container_add(GTK_CONTAINER(frame), entry_gfhigh); - g_signal_connect(G_OBJECT(entry_gflow), "changed", G_CALLBACK(gfhigh_edit), NULL); + gtk_widget_add_events(entry_gfhigh, GDK_FOCUS_CHANGE_MASK); + g_signal_connect(G_OBJECT(entry_gfhigh), "event", G_CALLBACK(gfhigh_edit), NULL); gtk_widget_show_all(dialog); result = gtk_dialog_run(GTK_DIALOG(dialog)); @@ -902,6 +912,8 @@ static void preferences_dialog(GtkWidget *w, gpointer data) subsurface_flush_conf(); } else if (result == GTK_RESPONSE_CANCEL) { prefs = oldprefs; + set_gf(prefs.gflow, prefs.gfhigh); + update_screen(); } free((void *)current_default); gtk_widget_destroy(dialog); -- cgit v1.2.3-70-g09d2