diff options
author | Robin Gareus <robin@gareus.org> | 2017-07-15 17:38:28 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2017-07-17 21:06:04 +0200 |
commit | 5c926136988757f1f11a14c11720ed3daac3195f (patch) | |
tree | 656b502db734ba104c40d088bc7b042fd6c77ee8 /gtk2_ardour/route_time_axis.cc | |
parent | d397e1f85cd2dce1fa79b672b40f5ea6a4b971f1 (diff) |
Separate Ardour UI widgets into dedicated library
Diffstat (limited to 'gtk2_ardour/route_time_axis.cc')
-rw-r--r-- | gtk2_ardour/route_time_axis.cc | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index c1fa5e26ba..62a68557ce 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -35,12 +35,15 @@ #include "pbd/enumwriter.h" #include "pbd/stateful_diff_command.h" -#include <gtkmm/menu.h> -#include <gtkmm/menuitem.h> -#include <gtkmm2ext/gtk_ui.h> -#include <gtkmm2ext/selector.h> -#include <gtkmm2ext/bindable_button.h> -#include <gtkmm2ext/utils.h> +#include "gtkmm/menu.h" +#include "gtkmm/menuitem.h" +#include "gtkmm2ext/gtk_ui.h" +#include "gtkmm2ext/selector.h" +#include "gtkmm2ext/bindable_button.h" +#include "gtkmm2ext/utils.h" + +#include "widgets/ardour_button.h" +#include "widgets/tooltips.h" #include "ardour/amp.h" #include "ardour/meter.h" @@ -58,7 +61,6 @@ #include "canvas/debug.h" #include "ardour_ui.h" -#include "ardour_button.h" #include "audio_streamview.h" #include "debug.h" #include "enums_convert.h" @@ -77,7 +79,6 @@ #include "rgb_macros.h" #include "selection.h" #include "streamview.h" -#include "tooltips.h" #include "ui_config.h" #include "utils.h" #include "route_group_menu.h" @@ -87,7 +88,7 @@ #include "pbd/i18n.h" using namespace ARDOUR; -using namespace ARDOUR_UI_UTILS; +using namespace ArdourWidgets; using namespace PBD; using namespace Gtkmm2ext; using namespace Gtk; @@ -1080,10 +1081,10 @@ RouteTimeAxisView::set_height (uint32_t h, TrackHeightMode m) void RouteTimeAxisView::route_color_changed () { + using namespace ARDOUR_UI_UTILS; if (_view) { _view->apply_color (color(), StreamView::RegionColor); } - number_label.set_fixed_colors (gdk_color_to_rgba (color()), gdk_color_to_rgba (color())); } |