From 6249a3e61c5a4ad2e37d9ad1530f0cd6d37bdbd8 Mon Sep 17 00:00:00 2001 From: Simon Long Date: Wed, 15 May 2024 18:43:39 +0100 Subject: [PATCH] Remove local mag_increment --- src/magnifier.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/magnifier.c b/src/magnifier.c index d73c212f..2312b6f3 100644 --- a/src/magnifier.c +++ b/src/magnifier.c @@ -8,7 +8,7 @@ #include "common/macros.h" bool magnify_on; -double mag_scale = 0.0, mag_increment = 0.0; +double mag_scale = 0.0; #define CLAMP(in, lower, upper) MAX(MIN(in, upper), lower) @@ -60,9 +60,6 @@ magnify(struct output *output, struct wlr_buffer *output_buffer, struct wlr_box if (mag_scale == 0.0) { mag_scale = theme->mag_scale; } - if (mag_increment == 0.0) { - mag_increment = theme->mag_increment; - } if (fullscreen) { width = output_buffer->width; @@ -267,17 +264,18 @@ void magnify_set_scale(struct server *server, enum magnify_dir dir) { struct output *output = output_nearest_to_cursor(server); + struct theme *theme = server->theme; if (dir == MAGNIFY_INCREASE) { if (magnify_on) { - mag_scale += mag_increment; + mag_scale += theme->mag_increment; } else { magnify_on = true; - mag_scale = 1.0 + mag_increment; + mag_scale = 1.0 + theme->mag_increment; } } else { - if (magnify_on && mag_scale > 1.0 + mag_increment) { - mag_scale -= mag_increment; + if (magnify_on && mag_scale > 1.0 + theme->mag_increment) { + mag_scale -= theme->mag_increment; } else { magnify_on = false; }