From: Clemens Ladisch <clemens@ladisch.de>
Date: Fri, 19 Jun 2009 06:40:00 +0000 (+0200)
Subject: alsamixer: fix display of inactive volume bar
X-Git-Tag: v1.0.21~3
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=077467a87e0a5ab598a8e4a582268eebe78ff9d6;p=alsa-utils.git

alsamixer: fix display of inactive volume bar

Fix the volume bar color selection logic so that the current attribute
is used for inactive controls.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
---

diff --git a/alsamixer/mixer_display.c b/alsamixer/mixer_display.c
index 79ed9d6..9eadcc9 100644
--- a/alsamixer/mixer_display.c
+++ b/alsamixer/mixer_display.c
@@ -475,13 +475,15 @@ static void display_control(unsigned int control_index)
 						    attr_ctl_frame : 0);
 				else {
 					ch = ACS_CKBOARD;
+					if (!(control->flags & IS_ACTIVE))
+						;
 #ifdef TRICOLOR_VOLUME_BAR
-					if (i > volume_height * 8 / 10)
+					else if (i > volume_height * 8 / 10)
 						ch |= attr_ctl_bar_hi;
 					else if (i > volume_height * 4 / 10)
 						ch |= attr_ctl_bar_mi;
-					else
 #endif
+					else
 						ch |= attr_ctl_bar_lo;
 				}
 				mvwaddch(mixer_widget.window, base_y - i - 1,