From f3159509ed2a0ee0668737f25ef19f4dcf1e0eca Mon Sep 17 00:00:00 2001
From: VKamyshniy <VKamyshniy@wavesglobal.com>
Date: Sun, 1 Feb 2015 21:09:18 +0200
Subject: [PATCH] [Summary] Fixing the bug: misaligned sizes of the timeline,
 skip ruler lane and marker ruler lane. This bug shifted tracks few lines up
 when hiding skip- and/or marker rulers

---
 gtk2_ardour/editor.cc            |   2 +-
 gtk2_ardour/editor.h             |   2 +-
 gtk2_ardour/ui/editor_window.xml | 173 ++++++++++++++++---------------
 3 files changed, 90 insertions(+), 87 deletions(-)

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 5c5b214321..f876d00b02 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -271,7 +271,7 @@ Editor::Editor ()
 	, _master_bus_ui_home (get_container ("master_bus_ui_home"))
 	, vpacker (get_v_box ("vpacker"))
     , timebars_vbox (get_v_box ("timebars_vbox"))
-	, marker_lane_hbox (get_h_box ("marker_lane_hbox"))
+	, marker_lane_hbox (get_container ("marker_lane_hbox"))
 	, skip_button (get_waves_button ("skip_button"))
     , add_marker_button (get_waves_button ("add_marker_button"))
     , global_solo_button (get_waves_button ("global_solo_button"))
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index fd97acbd32..74e7eb404f 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -713,7 +713,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	MasterBusUI*    _master_bus_ui;
 	Gtk::VBox&      vpacker;
     Gtk::VBox&      timebars_vbox;
-    Gtk::HBox&      marker_lane_hbox;
+    Gtk::Container& marker_lane_hbox;
     WavesButton&    skip_button;
 
 	std::stack<Gdk::Cursor*> _cursor_stack;
diff --git a/gtk2_ardour/ui/editor_window.xml b/gtk2_ardour/ui/editor_window.xml
index 842064ebb5..2d824f91ed 100644
--- a/gtk2_ardour/ui/editor_window.xml
+++ b/gtk2_ardour/ui/editor_window.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
                              
 <Window timebarheight="17"
-        rulerheight="63"
-        rulerdivideheight="31"
+        rulerheight="64"
+        rulerdivideheight="32"
         skipbarheight="17"
-        markerheight="18" >
+        markerheight="17" >
   <style name="topbar_dropdown"
          bgnormal="#0C474F"
          fgdisabled="#335b63"
@@ -458,94 +458,97 @@
                     table.xfill="false"
                     table.yfill="false">
                 <VBox id="timebars_vbox">
-                  <EventBox height="1"
-                            bgnormal="#424242"/>
-                  <EventBox bgnormal="#6C6C6C">
-                    <HBox id="marker_lane_hbox" noshowall="true">
-                      <Icon source="marker_label"/>
-                      <EventBox width="1"
-                                bgnormal="#424242"/>
-                      <Dropdown id="midi_input_dropdown"
-                                style="generic_dropdown"
-                                width="65"
-                                height="16"
-                                normalicon="marker_midi_dropdown"
-                                activeicon="marker_midi_dropdown_active">
-                        <HBox>
-                          <!--
+                  <VBox id="marker_lane_hbox">
+                    <EventBox height="1"
+                              bgnormal="#424242"/>
+                    <EventBox bgnormal="#6C6C6C">
+                      <HBox noshowall="true">
+                        <Icon source="marker_label"/>
+                        <EventBox width="1"
+                                  bgnormal="#424242"/>
+                        <Dropdown id="midi_input_dropdown"
+                                  style="generic_dropdown"
+                                  width="65"
+                                  height="16"
+                                  normalicon="marker_midi_dropdown"
+                                  activeicon="marker_midi_dropdown_active">
+                          <HBox>
+                            <!--
                           The following three icons should be shown/hidden according to the
                           availability/activity of the MIDI inputs
                           -->
-                          <Icon id="midi_input_enabled_indicator"
-                                source="midi_input_enabled_indicator"
-                                noshowall="true"/>
-                          <Icon id="midi_input_disabled_indicator"
-                                source="midi_input_disabled_indicator"
-                                visible="false"
-                                noshowall="true"/>
-                          <Icon id="midi_input_activity_indicator"
-                                source="midi_input_activity_indicator"
-                                visible="false"
-                                noshowall="true"/>
-                        </HBox>
-                        <DropdownMenu style="generic_dropdown_menu"/>
-                      </Dropdown>
-                      <EventBox width="1"
-                                bgnormal="#424242"/>
-                      <Dropdown id="midi_output_dropdown"
-                                style="generic_dropdown"
-                                width="65"
-                                height="16"
-                                normalicon="marker_midi_dropdown"
-                                activeicon="marker_midi_dropdown_active">
-                        <HBox>
-                          <!--
+                            <Icon id="midi_input_enabled_indicator"
+                                  source="midi_input_enabled_indicator"
+                                  noshowall="true"/>
+                            <Icon id="midi_input_disabled_indicator"
+                                  source="midi_input_disabled_indicator"
+                                  visible="false"
+                                  noshowall="true"/>
+                            <Icon id="midi_input_activity_indicator"
+                                  source="midi_input_activity_indicator"
+                                  visible="false"
+                                  noshowall="true"/>
+                          </HBox>
+                          <DropdownMenu style="generic_dropdown_menu"/>
+                        </Dropdown>
+                        <EventBox width="1"
+                                  bgnormal="#424242"/>
+                        <Dropdown id="midi_output_dropdown"
+                                  style="generic_dropdown"
+                                  width="65"
+                                  height="16"
+                                  normalicon="marker_midi_dropdown"
+                                  activeicon="marker_midi_dropdown_active">
+                          <HBox>
+                            <!--
                           The following three icons should be shown/hidden according to the
                           availability/activity of the MIDI outputs
                           -->
-                          <Icon id="midi_output_enabled_indicator"
-                                source="midi_output_enabled_indicator"
-                                noshowall="true"/>
-                          <Icon id="midi_output_disabled_indicator"
-                                source="midi_output_disabled_indicator"
-                                visible="false"
-                                noshowall="true"/>
-                          <Icon id="midi_output_activity_indicator"
-                                source="midi_output_activity_indicator"
-                                visible="false"
-                                noshowall="true"/>
-                        </HBox>
-                        <DropdownMenu style="generic_dropdown_menu"/>
-                      </Dropdown>
-                      <EventBox width="1"
-                                bgnormal="#424242"/>
-                      <iconbutton id="add_marker_button"
-                                  width="41"
-                                  height="16"
-                                  normalicon="add_marker_button"
-                                  activeicon="add_marker_button_active"
-                                  tooltip="Add Marker"/>
-                      <EventBox width="1"
-                                bgnormal="#424242"/>
-                    </HBox>
-                  </EventBox>
-                  <EventBox height="1"
-                            bgnormal="#424242"/>
-                  <EventBox id="skip_button_home"
-                            bgnormal="#6C6C6C">
-                    <HBox>
-                      <icon source="skip_lane_label"/>
-                      <EventBox width="1"
-                                bgnormal="#424242"/>
-                      <iconbutton id="skip_button"
-                                  width="41"
-                                  height="16"
-                                  normalicon="skip_off"
-                                  activeicon="skip_on"/>
-                      <EventBox width="1"
-                                bgnormal="#424242"/>
-                    </HBox>
-                  </EventBox>
+                            <Icon id="midi_output_enabled_indicator"
+                                  source="midi_output_enabled_indicator"
+                                  noshowall="true"/>
+                            <Icon id="midi_output_disabled_indicator"
+                                  source="midi_output_disabled_indicator"
+                                  visible="false"
+                                  noshowall="true"/>
+                            <Icon id="midi_output_activity_indicator"
+                                  source="midi_output_activity_indicator"
+                                  visible="false"
+                                  noshowall="true"/>
+                          </HBox>
+                          <DropdownMenu style="generic_dropdown_menu"/>
+                        </Dropdown>
+                        <EventBox width="1"
+                                  bgnormal="#424242"/>
+                        <iconbutton id="add_marker_button"
+                                    width="41"
+                                    height="16"
+                                    normalicon="add_marker_button"
+                                    activeicon="add_marker_button_active"
+                                    tooltip="Add Marker"/>
+                        <EventBox width="1"
+                                  bgnormal="#424242"/>
+                      </HBox>
+                    </EventBox>
+                  </VBox>
+                  <VBox id="skip_playback_lane">
+                    <EventBox height="1"
+                              bgnormal="#424242"/>
+                    <EventBox bgnormal="#6C6C6C">
+                      <HBox>
+                        <icon source="skip_lane_label"/>
+                        <EventBox width="1"
+                                  bgnormal="#424242"/>
+                        <iconbutton id="skip_button"
+                                    width="41"
+                                    height="16"
+                                    normalicon="skip_off"
+                                    activeicon="skip_on"/>
+                        <EventBox width="1"
+                                  bgnormal="#424242"/>
+                      </HBox>
+                    </EventBox>
+                  </VBox>
                   <EventBox height="1"
                             bgnormal="#424242"/>
                   <HBox id="global_tracks_hbox"