From 0d918f89811652f823b15b619d6a2e3382be0659 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 27 Feb 2007 18:22:25 +0000 Subject: tweak placement of region name text; patch from b0ef for color manager window mgmt git-svn-id: svn://localhost/ardour2/trunk@1527 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/ardour_ui2.cc | 3 +++ gtk2_ardour/time_axis_view_item.cc | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index a22d15565c..eec94b525f 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -42,6 +42,7 @@ #include "audio_clock.h" #include "actions.h" #include "utils.h" +#include "color_manager.h" #include "i18n.h" @@ -74,6 +75,8 @@ ARDOUR_UI::setup_windows () setup_transport(); build_menu_bar (); + color_manager->signal_unmap().connect (bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("/Common/ToggleColorManager"))); + top_packer.pack_start (menu_bar_base, false, false); top_packer.pack_start (transport_frame, false, false); diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc index bd4afd200e..18ea3c255e 100644 --- a/gtk2_ardour/time_axis_view_item.cc +++ b/gtk2_ardour/time_axis_view_item.cc @@ -88,7 +88,7 @@ TimeAxisViewItem::TimeAxisViewItem(const string & it_name, ArdourCanvas::Group& layout->set_font_description (NAME_FONT); Gtkmm2ext::get_ink_pixel_size (layout, width, height); - NAME_Y_OFFSET = height + 4; + NAME_Y_OFFSET = height + 6; NAME_HIGHLIGHT_SIZE = height + 6; NAME_HIGHLIGHT_THRESH = NAME_HIGHLIGHT_SIZE * 2; -- cgit v1.2.3