From e7c0171c4dcb54b527d1ba3ea4c597ad73bf067a Mon Sep 17 00:00:00 2001
From: VKamyshniy <VKamyshniy@wavesglobal.com>
Date: Wed, 11 Feb 2015 18:13:42 +0200
Subject: [PATCH] [Summary] Pixel hunting

---
 gtk2_ardour/editor.cc                    |  10 +--
 gtk2_ardour/icons/master_mute.png        | Bin 299 -> 364 bytes
 gtk2_ardour/icons/master_mute_active.png | Bin 729 -> 814 bytes
 gtk2_ardour/ui/editor_window.xml         |  80 +++++++++++++++--------
 gtk2_ardour/ui/master_ui.xml             |   2 +-
 5 files changed, 55 insertions(+), 37 deletions(-)

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 06e4b93899..e710e5cbf3 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -569,15 +569,9 @@ Editor::Editor ()
 	// CAIROCANVAS
 	time_pad->show();
 
-	edit_packer.set_col_spacings (0);
-	edit_packer.set_row_spacings (0);
-	edit_packer.set_homogeneous (false);
-	edit_packer.set_border_width (0);
-	edit_packer.set_name ("EditorWindow");
+    /* rest of the packing is done in ui/editor_window.xml */
 
-        /* rest of the packing is done in ui/editor_window.xml */
-
-	edit_packer.attach (*_track_canvas_viewport,  1, 2, 0, 2,    FILL|EXPAND, FILL|EXPAND, 0, 0);
+	edit_packer.attach (*_track_canvas_viewport,  1, 2, 1, 3,    FILL|EXPAND, FILL|EXPAND, 0, 0);
 
 	_route_groups = new EditorRouteGroups (this);
 	_routes = new EditorRoutes (this);
diff --git a/gtk2_ardour/icons/master_mute.png b/gtk2_ardour/icons/master_mute.png
index cf6cbb2f12c45d27fa5c5be3e519be71213e64e5..69809efe334ef1586a0baa01488727fdf7f88795 100755
GIT binary patch
delta 350
zcmZ3@^oD7Ic)c748v_GFK#9^OAjMwd>FdgVpNX4Wg>Bm6YEPgLXMsm#F$06#ArNNF
zyHIKe6l6(v^mSxl*x1kgCy^D%|Ly7G7*cWT?aYI`hYWaJqmMAHIl#3h!0iOX-YKFI
zjgnO_W!)0m)?5&kV9ZH$32}Y;Nj3U~y=KwtxcYtbgj7Rs?R!6;_n^Z}i7StfSs$@?
zoavw;%#q5p&_`hkXNyr|fSSN5mQ7#z0-XP;z58b2f4OASJ-<^|e?|UEe?P~2(YZ6{
zjwuLzzvk`w|AFiVw~(2tC$pZ*J`taoYPUu$`q9c4tty+&=p^Ue^RC)(@2vF|sfnpt
zi?5!3WUF#9HGG<JVEMN<vKhS>j9lmGeeS<-VRH~?<vEeQv*nvFeqPdbW@`S%2U}U$
n;-VW+oZ|#?qsM7y>pt<@n)*jhnkRVy1A@WR)z4*}Q$iB}n0Aq#

delta 285
zcmV+&0pkAb0;>X$7k?cH1^@s6*5FVa0000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+
zQe|Oed2z{QJOBUy%}GQ-RCwC#n$ZcuFc5~VxIkxd1s$OS<V9EL2)aT?&=GWntdJEt
zLe0Z3gxEqo^AP0w;J9n@5<c!|3T>Qo(*}yLQ*Kc4Gt(9a<$pjXGLeZ)KqfMg2_KjC
z+IT337-!XOjGJm7qetdC4oQ8L)Gk|R%nfuif|2<pV<NLv9+7FoYrOX{PFlMo)6SrL
z$)1sEAnnAUZbhb%kO&<rKWnvDqhs>2=_S(7>>+an&#XJc!X9JJw>cmanaBiWA`_W^
j&->EO|3(FP2^KH_@+=;F>@gCl00000NkvXXu0mjf*5`P{

diff --git a/gtk2_ardour/icons/master_mute_active.png b/gtk2_ardour/icons/master_mute_active.png
index 03288cbd99ac0e86622a714f3e008120079320a8..46352070f0ee4dc8eda319000b8f97584533d5c5 100755
GIT binary patch
delta 804
zcmV+<1Ka%B1+E5=7k?fI1^@s6P;?@)00007bV*G`2j2n<3nL?v<~hj#000SaNLh0L
z03N~s03N~tZqRi;00004XF*Lt006O%3;baP0008LNkl<Zc-rln&ubGw6vyBGYO+aC
zBNP=C>Y;}OZ1K>>Q^kW94<1BOP$`05L<Ii<6?#%Z6i*^5f`49AJa|Y?(o_(Q-c&3~
zAt|JYhL*ONY<_LVdAmDFnnOSwnQ53WJcgYg$>Xzc-n`vJ+w*3QfD#v(L92;&qz^<q
zn7N6BXh$}@=ne;6v=jX#1(Tx`Opa18Im-O^kKiMkz_Fs}v|b_|Eujaf6y=>1kr{wQ
zU-0G*PzzJDdw&>?Tht6(7pxa9St3(|Hb}G(_@GdvYaU)VsMV-dgO+s76Czn)vZ%DT
z-kmyX7Jp0<UDrt{yjU4cz4(3j`1dW3ZXdK3=8sWigxHZUm65TBwEr7j(+o_wWP*ti
z88w!Eo?SU}aU461<zEna`#M(HxBrQipTDts`hqvvT7S%^?Ch*gVP2(|^}vKnCYYE5
zBYL?sUK>sZ-ARbfqz^^j&8$^N#-QC#CswBSf}cA}AW80*!U^zmA?C<|?g6@;!7Stw
zogjVB4L08ZN!~5U2D7zObf@IC7?H+OF^N!FpT9z5dDi%=Z~Bjt1twGLL^cZxG-no}
zzH11a)PDi5FZAi7X#aXj7MKVTPvmt6iTys~we+Czud}lqD+rq}yd+|h38o8v-PlsN
zBN8!6twO#%*mQAzEm$W7P?=z2lsW5rn_n4F7Nty@>tf-K@EafrOj$}Jwq>1WY}3>D
z{hOyWrwsL>;b*b*^J{iC<K@uC;PzK^><ErE27h-v1|PnH*`-##EMB>DIezc@w7YF*
zdG*A(xo9T+!7Su=ubn*qxtbVVjz75dvbi~4T$#L-1wS(DAjuPuhCis~CK5vHH0lGU
z8#GoPS<t@Gtd3-ljqKSRA-c>&zd1sVQbZ;N!9cM*xFIFW0n`^#FgZ%W<R}G`qZCYz
iQXMckN>hK_;-^0m4(A%=U`dAn0000<MNUMnLSTaJp=XT%

delta 718
zcmV;<0x|ur2H6FW7k?cH1^@s6*5FVa0000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+
zQe|Oed2z{QJOBU!dr3q=RCwC#m_cY0K@^5(W@nph5~NXz3JUF^hX!mBX;bhZ9`xYB
zgD4(UO2LzeN3RN=R1m?Fh>D;W_2eO*q^Tepys21}f+?hkhJTh;Om@@k?l`k~n~qVc
z&|;_f9{ddZb{1wo-pu?nwD0+pAQ)>B99oJfRvm&NgS88Ui7*i+!u*FpVLTRWj4R0k
zss429`EfIT0IU%;2xP34#uQ2gpb)g)7Ef@4s#1-m3zPt$qyrL#XJ2YbssXJq04CuE
zEjMZ`&gL7Jj(_m#=P|(;6N%)kH<W+;{m`+G-FL6=w`Zo0N@PMfsdwJs@Ew`|pj9S8
zn9DF#MW(H}FXIcR&W@<0HUE{QUOdZqyGQTa<>@PnC(lHk?b&kPDNQm7^MZVAf)J(#
z)0RrHdTnH>KL_a?Nlz3Gq+U*ZYYYyP<-F|ZJ>4anq<>V+l#SGs-JHT2+12?%PG`a^
zp9XZ0t&v-C|37V3|1He+Okr*<YE?yAbJd)J8s}PHP^Q@=^qIf27wz?@G9%Z_DrxTM
zC2oFSluNvMji&uCA%>kBiSw!$wQ{3rJ(ni6FGSp5Ak1H32H+dpk<=<tRjFMmYqmWI
zz+(oc0Dm<Jrm8ac=WO^s1{zmsd&vv}AK?3@z%<1g#Z%S|Gn*b{Z(Th>-8yOZ_CL%N
z9$j=w#b^!nd$v81?+&YXe$V!M0N)sxrku?!@R>@<?9Iyu!|pBh#p9=^(#1j_uatLs
zd-lF<3=GX@Z(kb~oL3jd&Xu4tW7EFgryyYpOh?vnV`OWyCiao~g@z9R15J3*p-uA;
zAT`Ja4ZIvim<SVLVjxU}xzU4b$2p8u#t#7o0DkM)brBIw@&Et;07*qoM6N<$g6OVG
ASO5S3

diff --git a/gtk2_ardour/ui/editor_window.xml b/gtk2_ardour/ui/editor_window.xml
index f176138b97..8d2f2fc461 100644
--- a/gtk2_ardour/ui/editor_window.xml
+++ b/gtk2_ardour/ui/editor_window.xml
@@ -463,19 +463,34 @@
                   paned.resize="true"
                   paned.shrink="true">
             <Table id="edit_packer"
-                   rows="3"
+                   rows="4"
                    columns="3">
               <HBox table.leftattach="0"
-                    table.rightattach="1"
+                    table.rightattach="3"
                     table.topattach="0"
                     table.bottomattach="1"
-                    table.xfill="false"
-                    table.yfill="false">
+                    table.xfill="true"
+                    table.yfill="true">
+              <EventBox bgnormal="#424242"
+                        height="1"
+                        width="233"/>
+                <EventBox bgnormal="#000000"
+                          height="1"
+                          width="1"/>
+                <EventBox bgnormal="#424242"
+                          height="1"
+                          box.expand="true"
+                          box.fill="true"/>
+              </HBox>
+                <HBox table.leftattach="0"
+                      table.rightattach="1"
+                      table.topattach="1"
+                      table.bottomattach="2"
+                      table.xfill="false"
+                      table.yfill="false">
                 <VBox id="timebars_vbox">
                   <VBox id="marker_lane"
                         noshowall="true">
-                    <EventBox height="1"
-                              bgnormal="#424242"/>
                     <EventBox bgnormal="#6C6C6C">
                       <HBox noshowall="true">
                         <Icon source="marker_label"/>
@@ -545,11 +560,11 @@
                                   bgnormal="#424242"/>
                       </HBox>
                     </EventBox>
-                  </VBox>
-                    <VBox id="skip_playback_lane"
-                          noshowall="true">
                     <EventBox height="1"
                               bgnormal="#424242"/>
+                  </VBox>
+                  <VBox id="skip_playback_lane"
+                        noshowall="true">
                     <EventBox bgnormal="#6C6C6C">
                       <HBox>
                         <icon source="skip_lane_label"/>
@@ -564,9 +579,9 @@
                                   bgnormal="#424242"/>
                       </HBox>
                     </EventBox>
+                    <EventBox height="1"
+                              bgnormal="#424242"/>
                   </VBox>
-                  <EventBox height="1"
-                            bgnormal="#424242"/>
                   <HBox id="global_tracks_hbox"
                         spacing="1">
                     <Dropdown id="global_tracks_dropdown"
@@ -609,40 +624,49 @@
                 <EventBox width="1"
                           bgnormal="#000000"/>
               </HBox>
+              <HBox table.leftattach="0"
+                    table.rightattach="1"
+                    table.topattach="2"
+                    table.bottomattach="3"
+                    table.yfill="true"
+                    table.yexpand="true">
               <Layout id="controls_layout"
                       hadjustment="unused_adjustment"
                       vadjustment="vertical_adjustment"
-                      table.leftattach="0"
-                      table.rightattach="1"
-                      table.topattach="1"
-                      table.bottomattach="2"
-                      table.yfill="true"
-                      table.yexpand="true"
                       bgnormal="#3E3E3E">
                 <VBox id="edit_controls_vbox"
                       width="233"/>
               </Layout>
+              <EventBox width="1"
+                        bgnormal="#000000"/>
+
+              </HBox>
               <VScrollbar adjustment="vertical_adjustment"
                           table.leftattach="2"
                           table.rightattach="3"
-                          table.topattach="1"
-                          table.bottomattach="2"
+                          table.topattach="2"
+                          table.bottomattach="3"
                           table.yfill="true"
                           bgnormal="#353535"/>
               <HScrollbar adjustment="horizontal_adjustment"
                           table.leftattach="1"
                           table.rightattach="2"
-                          table.topattach="2"
-                          table.bottomattach="3"
+                          table.topattach="3"
+                          table.bottomattach="4"
                           table.xfill="true"
                           bgnormal="#353535"/>
-              <EventBox table.leftattach="0"
-                        table.rightattach="1"
-                        table.topattach="2"
-                        table.bottomattach="3"
-                        table.xfill="true"
-                        table.yfill="true"
-                        bgnormal="#383838"/>
+              <HBox table.leftattach="0"
+                    table.rightattach="1"
+                    table.topattach="3"
+                    table.bottomattach="4"
+                    table.xfill="true"
+                    table.yfill="true">
+                <EventBox bgnormal="#383838"
+                          box.fill="true"
+                          box.expand="true"/>
+                <EventBox bgnormal="#000000"
+                          width="1"/>
+              </HBox>
             </Table>
           </VPaned>
         </HPaned>
diff --git a/gtk2_ardour/ui/master_ui.xml b/gtk2_ardour/ui/master_ui.xml
index 659d75d072..12222d6ae0 100644
--- a/gtk2_ardour/ui/master_ui.xml
+++ b/gtk2_ardour/ui/master_ui.xml
@@ -39,7 +39,7 @@
             noshowall="true"/>
       <iconbutton id="master_mute_button"
                   width="83"
-                  height="29"
+                  height="30"
                   normalicon="master_mute"
                   activeicon="master_mute_active"
                   _prelighticon="master_mute_prelight"