From fb4b5b83df5002a302773f46d38d5c6e243cf0c6 Mon Sep 17 00:00:00 2001 From: JuanMiguelBG Date: Wed, 12 Jan 2022 10:33:55 +0000 Subject: [PATCH] When brightness/volume are in their minor value, the first increment always is the step value --- Cargo.lock | 2 +- Cargo.toml | 2 +- src/main.rs | 20 +++++++++++++++++--- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4fe4d15..26ee784 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -153,7 +153,7 @@ dependencies = [ [[package]] name = "ogage" -version = "0.8.4" +version = "0.8.5" dependencies = [ "evdev-rs", "lazy_static", diff --git a/Cargo.toml b/Cargo.toml index 0843491..8807d79 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ogage" -version = "0.8.4" +version = "0.8.5" authors = ["valadaa48 "] edition = "2018" diff --git a/src/main.rs b/src/main.rs index b1ea0ca..dfdd80e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -571,7 +571,14 @@ fn set_volume(volume: u32) { } fn inc_brightness() { - set_brightness(get_brightness() + *BRIGHTNESS_STEP); + let mut brightness = get_brightness(); + if brightness < *BRIGHTNESS_STEP { + brightness = *BRIGHTNESS_STEP; + } + else { + brightness = brightness + *BRIGHTNESS_STEP; + } + set_brightness(brightness); } fn dec_brightness() { @@ -582,11 +589,18 @@ fn dec_brightness() { else { brightness = brightness - *BRIGHTNESS_STEP; } - set_brightness( brightness ); + set_brightness(brightness); } fn inc_volume() { - set_volume(get_volume() + *VOLUME_STEP); + let mut volume = get_volume(); + if volume < *VOLUME_STEP { + volume = *VOLUME_STEP; + } + else { + volume = volume + *VOLUME_STEP; + } + set_volume(volume); } fn dec_volume() {