When brightness/volume are in their minor value, the first increment …

…always is the step value
JuanMiguelBG · Jan 12, 2022 · fb4b5b8 · fb4b5b8
1 parent 79ba0b1
commit fb4b5b8
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ogage"
-version = "0.8.4"
+version = "0.8.5"
 authors = ["valadaa48 <valadaa48@gmx.com>"]
 edition = "2018"
 

diff --git 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() {