From a30f8398aa47ba59ca7f2c8e85c4e4f486f02b0d Mon Sep 17 00:00:00 2001
From: lllucius <lllucius@47890b92-0858-11df-a26f-8b716316a5bc>
Date: Sun, 28 Dec 2014 23:48:01 +0000
Subject: [PATCH] Let's try narrower icons...

...to see if it removes enough "gray" space on the left
of the vertical meter to be bareable.
---
 images/MicMenu.xpm     | 41 +++++++++++++++++++++++++++++++++++++++++
 images/SpeakerMenu.xpm | 38 ++++++++++++++++++++++++++++++++++++++
 src/widgets/Meter.cpp  |  6 +++---
 3 files changed, 82 insertions(+), 3 deletions(-)

diff --git a/images/MicMenu.xpm b/images/MicMenu.xpm
index a8dc14a91..02cfb9867 100644
--- a/images/MicMenu.xpm
+++ b/images/MicMenu.xpm
@@ -38,3 +38,44 @@ static const char * MicMenu_xpm[] = {
 "  ..              ..... ",
 " .                 ...  ",
 ".                   .   "};
+
+/* XPM */
+static const char * MicMenuNarrow_xpm[] = {
+"19 19 18 1",
+" 	c None",
+".	c #000000",
+"+	c #DCDCDC",
+"@	c #B5B5B5",
+"#	c #8C8C8C",
+"$	c #D6D6D6",
+"%	c #9C9C9C",
+"&	c #6B6B6B",
+"*	c #EFEFEF",
+"=	c #C6C6C6",
+"-	c #737373",
+";	c #4A4A4A",
+">	c #DEDEDE",
+",	c #424242",
+"'	c #212121",
+")	c #ADADAD",
+"!	c #848484",
+"~	c #636363",
+"            ....   ",
+"           .+@+#.  ",
+"          ..$+%+&. ",
+"         .+*.=+-+;.",
+"         .>+*.%+,+.",
+"         .+=+=.'+'.",
+"         ..+)+;....",
+"         ..%+-+'.. ",
+"        .+..!~;..  ",
+"       .+.......   ",
+"      .+...        ",
+"     .+...         ",
+"    .+...          ",
+"   .+...           ",
+"   ....            ",
+"  ....      .......",
+"  ..         ..... ",
+" .            ...  ",
+".              .   "};
diff --git a/images/SpeakerMenu.xpm b/images/SpeakerMenu.xpm
index 8c14b208f..c08ce542c 100644
--- a/images/SpeakerMenu.xpm
+++ b/images/SpeakerMenu.xpm
@@ -34,3 +34,41 @@ static const char * SpeakerMenu_xpm[] = {
 "                  $$$$$ ",
 "                   $$$  ",
 "                    $   "};
+
+/* XPM */
+static const char * SpeakerMenuNarrow_xpm[] = {
+"19 19 14 1",
+" 	c None",
+".	c #C1C1C1",
+"+	c #2F2F2F",
+"@	c #707070",
+"#	c #4B4B4B",
+"$	c #000000",
+"%	c #090909",
+"&	c #383838",
+"*	c #838383",
+"=	c #7A7A7A",
+"-	c #414141",
+";	c #8C8C8C",
+">	c #131313",
+",	c #676767",
+"            .      ",
+"            +      ",
+"       @    #@     ",
+"       $     %     ",
+"      &$  &  *&    ",
+"   ===$$  -=  $    ",
+"   $$$$$   $  $    ",
+"   $$$$$   $  $    ",
+"   &&&$$  *&  $    ",
+"      $$  %   $    ",
+"      @$  @  #@    ",
+"       +    ;+     ",
+"       .    >.     ",
+"            ,      ",
+"                   ",
+"            $$$$$$$",
+"             $$$$$ ",
+"              $$$  ",
+"               $   "};
+ 
\ No newline at end of file
diff --git a/src/widgets/Meter.cpp b/src/widgets/Meter.cpp
index 15e977f59..cad154d62 100644
--- a/src/widgets/Meter.cpp
+++ b/src/widgets/Meter.cpp
@@ -284,11 +284,11 @@ Meter::Meter(AudacityProject *project,
    {
       if(mIsInput)
       {
-         mIcon = new wxBitmap(MicMenu_xpm);
+         mIcon = new wxBitmap(MicMenuNarrow_xpm);
       }
       else
       {
-         mIcon = new wxBitmap(SpeakerMenu_xpm);
+         mIcon = new wxBitmap(SpeakerMenuNarrow_xpm);
       }
    }
 
@@ -1156,7 +1156,7 @@ void Meter::HandleLayout(wxDC &dc)
       rside = intmax(mRulerWidth, rtxtWidth);
 
       // left is now the right edge of the icon or L label
-      left = gap + lside;
+      left = lside;
 
       // Ensure there's a margin between top edge of window and the meters
       top = gap;