robert/alsa-scarlett-gui
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix GtkDial to not redraw the dial if the set value doesn't change

Browse Source
This commit is contained in:
Geoffrey D. Bennett
2024-02-13 11:58:46 +10:30
parent 22a2aa2ad6
commit 7a7e08d4eb
1 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/gtkdial.c
View File

@@ -21,7 +21,7 @@
#define DIAL_MIN_WIDTH 50 #define DIAL_MIN_WIDTH 50
#define DIAL_MAX_WIDTH 70 #define DIAL_MAX_WIDTH 70
static void set_value(GtkDial *dial, double newval); static int set_value(GtkDial *dial, double newval);
static void gtk_dial_set_property( static void gtk_dial_set_property(
GObject *object, GObject *object,
@@ -291,7 +291,7 @@ static void cairo_add_stop_rgb_dim(
cairo_pattern_add_color_stop_rgb(pat, offset, r * x, g * x, b * x); cairo_pattern_add_color_stop_rgb(pat, offset, r * x, g * x, b * x);
} }
static void update_dial_properties(GtkDial *dial) { static int update_dial_properties(GtkDial *dial) {
// always update // always update
dial->dim = !gtk_widget_is_sensitive(GTK_WIDGET(dial)) && dial->can_control; dial->dim = !gtk_widget_is_sensitive(GTK_WIDGET(dial)) && dial->can_control;
@@ -302,7 +302,7 @@ static void update_dial_properties(GtkDial *dial) {
double height = gtk_widget_get_height(GTK_WIDGET(dial)); double height = gtk_widget_get_height(GTK_WIDGET(dial));
if (dial->w == width && dial->h == height && !dial->properties_updated) if (dial->w == width && dial->h == height && !dial->properties_updated)
return; return 0;
dial->w = width; dial->w = width;
dial->h = height; dial->h = height;
@@ -395,6 +395,8 @@ static void update_dial_properties(GtkDial *dial) {
calc_val(valp, ANGLE_START, ANGLE_END); calc_val(valp, ANGLE_START, ANGLE_END);
} }
} }
return 1;
} }
static void update_dial_values(GtkDial *dial) { static void update_dial_values(GtkDial *dial) {
@@ -738,8 +740,8 @@ static void draw_slider(
static void dial_snapshot(GtkWidget *widget, GtkSnapshot *snapshot) { static void dial_snapshot(GtkWidget *widget, GtkSnapshot *snapshot) {
GtkDial *dial = GTK_DIAL(widget); GtkDial *dial = GTK_DIAL(widget);
update_dial_properties(dial); if (update_dial_properties(dial))
update_dial_values(dial); update_dial_values(dial);
cairo_t *cr = gtk_snapshot_append_cairo( cairo_t *cr = gtk_snapshot_append_cairo(
snapshot, snapshot,
@@ -926,8 +928,8 @@ double gtk_dial_get_value(GtkDial *dial) {
} }
void gtk_dial_set_value(GtkDial *dial, double value) { void gtk_dial_set_value(GtkDial *dial, double value) {
set_value(dial, value); if (set_value(dial, value))
gtk_widget_queue_draw(GTK_WIDGET(dial)); gtk_widget_queue_draw(GTK_WIDGET(dial));
} }
void gtk_dial_set_round_digits(GtkDial *dial, int round_digits) { void gtk_dial_set_round_digits(GtkDial *dial, int round_digits) {
@@ -1038,7 +1040,7 @@ GtkAdjustment *gtk_dial_get_adjustment(GtkDial *dial) {
return dial->adj; return dial->adj;
} }
static void set_value(GtkDial *dial, double newval) { static int set_value(GtkDial *dial, double newval) {
if (dial->round_digits >= 0) { if (dial->round_digits >= 0) {
double power; double power;
int i; int i;
@@ -1051,8 +1053,23 @@ static void set_value(GtkDial *dial, double newval) {
newval = floor((newval * power) + 0.5) / power; newval = floor((newval * power) + 0.5) / power;
} }
if (newval < gtk_adjustment_get_lower(dial->adj))
newval = gtk_adjustment_get_lower(dial->adj);
else if (newval > gtk_adjustment_get_upper(dial->adj))
newval = gtk_adjustment_get_upper(dial->adj);
double oldval = gtk_adjustment_get_value(dial->adj);
if (oldval == newval)
return 0;
gtk_adjustment_set_value(dial->adj, newval); gtk_adjustment_set_value(dial->adj, newval);
g_signal_emit(dial, signals[VALUE_CHANGED], 0); g_signal_emit(dial, signals[VALUE_CHANGED], 0);
double old_valp = dial->valp;
update_dial_values(dial);
return old_valp != dial->valp;
} }
static void step_back(GtkDial *dial) { static void step_back(GtkDial *dial) {