From 20b6a25f5b2917ee46536566bb29e91c5bb91e06 Mon Sep 17 00:00:00 2001 From: Ordissimo Date: Wed, 15 Feb 2023 22:11:20 +0100 Subject: [PATCH] Fix selection --- src/gtkglue.c | 4 ++-- src/preview.c | 4 ++-- src/xscanimage.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gtkglue.c b/src/gtkglue.c index 771ae00..c112d40 100644 --- a/src/gtkglue.c +++ b/src/gtkglue.c @@ -357,8 +357,8 @@ autobutton_update (GtkWidget * widget, GSGDialogElement * elem) opt = sane_get_option_descriptor (dialog->dev, opt_num); if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) { - gtk_widget_set_sensitive(GTK_WIDGET (scale), FALSE); set_option (dialog, opt_num, 0, SANE_ACTION_SET_AUTO); + gtk_widget_set_sensitive(GTK_WIDGET (scale), FALSE); } else { @@ -529,7 +529,7 @@ scale_new (GtkWidget * parent, const char *name, gfloat val, scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, min, max, quant); elem->data = gtk_range_get_adjustment (GTK_RANGE (scale)); */ - gtk_scale_set_value_pos (GTK_SCALE (scale), val); + gtk_adjustment_set_value (GTK_ADJUSTMENT(elem->data), val); set_tooltip (scale, desc); gtk_widget_set_size_request (scale, 200, 0); diff --git a/src/preview.c b/src/preview.c index fb65c18..5251867 100644 --- a/src/preview.c +++ b/src/preview.c @@ -1182,7 +1182,7 @@ expose_handler (GtkWidget * window, cairo_t *cr, gpointer data) cairo_paint(cr); g_object_unref(pixbuf); - // => update_selection (p); + update_selection (p); draw_selection (p, cr); p->selection.active = FALSE; @@ -1239,8 +1239,8 @@ button_release_handler (GtkWidget *window, if (p->selection.coord[3] >= p->preview_height) p->selection.coord[3] = p->preview_height - 1; } - gtk_widget_queue_draw (p->window); establish_selection (p); + gtk_widget_queue_draw (p->window); return FALSE; } diff --git a/src/xscanimage.c b/src/xscanimage.c index 5ac66f5..ad6bd84 100644 --- a/src/xscanimage.c +++ b/src/xscanimage.c @@ -116,7 +116,7 @@ enum STANDALONE, SANE_GIMP_EXTENSION }; -static struct +struct scan_win_t { GtkWidget *shell; GtkWidget *menubar;