#include "canvas/rectangle.h"
#include "canvas/debug.h"
#include "canvas/text.h"
-#include "canvas/colors.h"
+#include "gtkmm2ext/colors.h"
#include "ardour/profile.h"
-#include "ardour_ui.h"
-/*
- * ardour_ui.h was moved up in the include list
- * due to a conflicting definition of 'Rect' between
- * Apple's MacTypes.h file and GTK
- */
-
#include "public_editor.h"
#include "time_axis_view_item.h"
#include "time_axis_view.h"
+#include "ui_config.h"
#include "utils.h"
#include "rgb_macros.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace std;
using namespace Editing;
void
TimeAxisViewItem::set_constant_heights ()
{
- NAME_FONT = Pango::FontDescription (ARDOUR_UI::config()->get_SmallFont());
+ NAME_FONT = Pango::FontDescription (UIConfiguration::instance().get_SmallFont());
- Gtk::Window win;
- Gtk::Label foo;
- win.add (foo);
+ Gtk::Window win;
+ Gtk::Label foo;
+ win.add (foo);
-
Glib::RefPtr<Pango::Layout> layout = foo.create_pango_layout (X_("Hg")); /* ascender + descender */
- int width = 0;
- int height = 0;
+ Glib::RefPtr<Pango::Layout> layout = foo.create_pango_layout (X_("Hg")); /* ascender + descender */
+ int width = 0;
+ int height = 0;
- layout->set_font_description (NAME_FONT);
- get_pixel_size (layout, width, height);
+ layout->set_font_description (NAME_FONT);
+ get_pixel_size (layout, width, height);
- layout = foo.create_pango_layout (X_("H")); /* just the ascender */
+ layout = foo.create_pango_layout (X_("H")); /* just the ascender */
- NAME_HEIGHT = height;
+ NAME_HEIGHT = height;
- /* Config->get_show_name_highlight) == true:
+ /* Config->get_show_name_highlight) == true:
Y_OFFSET is measured from bottom of the time axis view item.
- Config->get_show_name_highlight) == false:
+ Config->get_show_name_highlight) == false:
Y_OFFSET is measured from the top of the time axis view item.
*/
- if (ARDOUR_UI::config()->get_show_name_highlight()) {
+ if (UIConfiguration::instance().get_show_name_highlight()) {
NAME_Y_OFFSET = height + 1;
NAME_HIGHLIGHT_SIZE = height + 2;
} else {
NAME_Y_OFFSET = 3;
NAME_HIGHLIGHT_SIZE = 0;
}
- NAME_HIGHLIGHT_THRESH = NAME_HIGHLIGHT_SIZE * 3;
+ NAME_HIGHLIGHT_THRESH = NAME_HIGHLIGHT_SIZE * 3;
}
/**
/* share the other's parent, but still create a new group */
ArdourCanvas::Item* parent = other.group->parent();
-
+
_selected = other._selected;
-
+
init (parent, other.samples_per_pixel, other.fill_color, other.frame_position,
other.item_duration, other.visibility, other.wide_enough_for_name, other.high_enough_for_name);
}
void
-TimeAxisViewItem::init (ArdourCanvas::Item* parent, double fpp, uint32_t base_color,
- framepos_t start, framepos_t duration, Visibility vis,
+TimeAxisViewItem::init (ArdourCanvas::Item* parent, double fpp, uint32_t base_color,
+ framepos_t start, framepos_t duration, Visibility vis,
bool wide, bool high)
{
group = new ArdourCanvas::Container (parent);
CANVAS_DEBUG_NAME (group, string_compose ("TAVI group for %1", get_item_name()));
- group->Event.connect (sigc::mem_fun (*this, &TimeAxisViewItem::canvas_group_event));
fill_color = base_color;
fill_color_name = "time axis view item base";
position_locked = false;
max_item_duration = ARDOUR::max_framepos;
min_item_duration = 0;
- show_vestigial = true;
visibility = vis;
_sensitive = true;
name_text_width = 0;
last_item_width = 0;
wide_enough_for_name = wide;
high_enough_for_name = high;
- vestigial_frame = 0;
if (duration == 0) {
warning << "Time Axis Item Duration == 0" << endl;
}
if (visibility & ShowFrame) {
- frame = new ArdourCanvas::Rectangle (group,
- ArdourCanvas::Rect (0.0, 0.0,
- trackview.editor().sample_to_pixel(duration),
+ frame = new ArdourCanvas::Rectangle (group,
+ ArdourCanvas::Rect (0.0, 0.0,
+ trackview.editor().sample_to_pixel(duration),
trackview.current_height()));
-
+
frame->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::LEFT|ArdourCanvas::Rectangle::RIGHT));
+ frame->show ();
CANVAS_DEBUG_NAME (frame, string_compose ("frame for %1", get_item_name()));
if (_recregion) {
- frame->set_outline_color (ARDOUR_UI::config()->color ("recording rect"));
+ frame->set_outline_color (UIConfiguration::instance().color ("recording rect"));
} else {
- frame->set_outline_color (ARDOUR_UI::config()->color ("time axis frame"));
+ frame->set_outline_color (UIConfiguration::instance().color ("time axis frame"));
}
}
-
- if (ARDOUR_UI::config()->get_show_name_highlight() && (visibility & ShowNameHighlight)) {
+
+ if (UIConfiguration::instance().get_show_name_highlight() && (visibility & ShowNameHighlight)) {
/* rectangle size will be set in ::manage_name_highlight() */
name_highlight = new ArdourCanvas::Rectangle (group);
CANVAS_DEBUG_NAME (name_highlight, string_compose ("name highlight for %1", get_item_name()));
name_highlight->set_data ("timeaxisviewitem", this);
- name_highlight->set_outline_what (ArdourCanvas::Rectangle::TOP);
- name_highlight->set_outline_color (RGBA_TO_UINT (0,0,0,255)); // this should use a theme color
+ name_highlight->set_outline_what (ArdourCanvas::Rectangle::TOP);
+ name_highlight->set_outline_color (RGBA_TO_UINT (0,0,0,255)); // this should use a theme color
} else {
name_highlight = 0;
if (visibility & ShowNameText) {
name_text = new ArdourCanvas::Text (group);
CANVAS_DEBUG_NAME (name_text, string_compose ("name text for %1", get_item_name()));
- if (ARDOUR_UI::config()->get_show_name_highlight()) {
+ if (UIConfiguration::instance().get_show_name_highlight()) {
name_text->set_position (ArdourCanvas::Duple (NAME_X_OFFSET, trackview.current_height() - NAME_Y_OFFSET));
} else {
name_text->set_position (ArdourCanvas::Duple (NAME_X_OFFSET, NAME_Y_OFFSET));
frame_handle_start = frame_handle_end = 0;
}
- set_color (base_color);
+ //set_color (base_color);
- set_duration (item_duration, this);
- set_position (start, this);
+ //set_duration (item_duration, this);
+ //set_position (start, this);
- Config->ParameterChanged.connect (*this, invalidator (*this), boost::bind (&TimeAxisViewItem::parameter_changed, this, _1), gui_context ());
- ARDOUR_UI::config()->ParameterChanged.connect (sigc::mem_fun (*this, &TimeAxisViewItem::parameter_changed));
+ group->Event.connect (sigc::mem_fun (*this, &TimeAxisViewItem::canvas_group_event));
+ //Config->ParameterChanged.connect (*this, invalidator (*this), boost::bind (&TimeAxisViewItem::parameter_changed, this, _1), gui_context ());
+ UIConfiguration::instance().ParameterChanged.connect (sigc::mem_fun (*this, &TimeAxisViewItem::parameter_changed));
}
TimeAxisViewItem::~TimeAxisViewItem()
if (_selected == yn) {
return;
}
-
+
Selectable::set_selected (yn);
set_frame_color ();
set_name_text_color ();
if (!selection_frame) {
selection_frame = new ArdourCanvas::Rectangle (group);
selection_frame->set_fill (false);
- selection_frame->set_outline_color (ARDOUR_UI::config()->color ("selected time axis frame"));
+ selection_frame->set_outline_color (UIConfiguration::instance().color ("selected time axis frame"));
selection_frame->set_ignore_events (true);
}
selection_frame->set (frame->get().shrink (1.0));
name_text_width = pixel_width (new_name, NAME_FONT) + 2;
name_text->set (new_name);
manage_name_text ();
-
+ manage_name_highlight ();
}
/**
void
TimeAxisViewItem::set_height (double height)
{
- _height = height;
+ _height = height;
manage_name_highlight ();
if (visibility & ShowNameText) {
- if (ARDOUR_UI::config()->get_show_name_highlight()) {
- name_text->set_y_position (height - NAME_Y_OFFSET);
+ if (UIConfiguration::instance().get_show_name_highlight()) {
+ name_text->set_y_position (height - NAME_Y_OFFSET);
} else {
- name_text->set_y_position (NAME_Y_OFFSET);
+ name_text->set_y_position (NAME_Y_OFFSET);
}
}
if (frame) {
-
+
frame->set_y0 (0.0);
frame->set_y1 (height);
selection_frame->set (frame->get().shrink (1.0));
}
}
-
- if (vestigial_frame) {
- vestigial_frame->set_y0 (0.0);
- vestigial_frame->set_y1 (height);
- }
-
- set_colors ();
}
void
name_highlight->show();
// name_highlight->set_x_position (1.0);
name_highlight->set (ArdourCanvas::Rect (0.0, (double) _height - NAME_HIGHLIGHT_SIZE, _width - 2.0, _height));
-
+
} else {
name_highlight->hide();
}
set_frame_color ();
if (name_highlight) {
- name_highlight->set_fill_color (fill_color);
+ name_highlight->set_fill_color (fill_color);
}
set_name_text_color ();
if (!name_text) {
return;
}
-
+
uint32_t f;
-
- if (ARDOUR_UI::config()->get_show_name_highlight()) {
+
+ if (UIConfiguration::instance().get_show_name_highlight()) {
/* name text will always be on top of name highlight, which
will always use our fill color.
*/
f = get_fill_color ();
}
- name_text->set_color (ArdourCanvas::contrasting_text_color (f));
+ name_text->set_color (contrasting_text_color (f));
}
-ArdourCanvas::Color
+Gtkmm2ext::Color
TimeAxisViewItem::get_fill_color () const
{
const std::string mod_name = (_dragging ? "dragging region" : fill_color_name);
if (_selected) {
- return ARDOUR_UI::config()->color_mod ("selected region base", mod_name);
+ return UIConfiguration::instance().color_mod ("selected region base", mod_name);
} else if (_recregion) {
- return ARDOUR_UI::config()->color ("recording rect");
- } else if ((!ARDOUR_UI::config()->get_show_name_highlight() || high_enough_for_name) &&
- !ARDOUR_UI::config()->get_color_regions_using_track_color()) {
- return ARDOUR_UI::config()->color_mod (fill_color_name, mod_name);
+ return UIConfiguration::instance().color ("recording rect");
+ } else if ((!UIConfiguration::instance().get_show_name_highlight() || high_enough_for_name) &&
+ !UIConfiguration::instance().get_color_regions_using_track_color()) {
+ return UIConfiguration::instance().color_mod (fill_color_name, mod_name);
}
- return ARDOUR_UI::config()->color_mod (fill_color, mod_name);
+ return UIConfiguration::instance().color_mod (fill_color, mod_name);
}
/**
set_frame_gradient ();
if (!_recregion) {
- frame->set_outline_color (ARDOUR_UI::config()->color ("time axis frame"));
+ frame->set_outline_color (UIConfiguration::instance().color ("time axis frame"));
}
}
void
TimeAxisViewItem::set_frame_gradient ()
{
- if (ARDOUR_UI::config()->get_timeline_item_gradient_depth() == 0.0) {
+ if (UIConfiguration::instance().get_timeline_item_gradient_depth() == 0.0) {
frame->set_gradient (ArdourCanvas::Fill::StopList (), 0);
return;
}
-
+
ArdourCanvas::Fill::StopList stops;
double r, g, b, a;
double h, s, v;
- ArdourCanvas::Color f (get_fill_color());
+ Color f (get_fill_color());
/* need to get alpha value */
- ArdourCanvas::color_to_rgba (f, r, g, b, a);
-
+ color_to_rgba (f, r, g, b, a);
+
stops.push_back (std::make_pair (0.0, f));
-
+
/* now a darker version */
-
- ArdourCanvas::color_to_hsv (f, h, s, v);
- v = min (1.0, v * (1.0 - ARDOUR_UI::config()->get_timeline_item_gradient_depth()));
-
- ArdourCanvas::Color darker = ArdourCanvas::hsva_to_color (h, s, v, a);
+ color_to_hsv (f, h, s, v);
+
+ v = min (1.0, v * (1.0 - UIConfiguration::instance().get_timeline_item_gradient_depth()));
+
+ Color darker = hsva_to_color (h, s, v, a);
stops.push_back (std::make_pair (1.0, darker));
-
+
frame->set_gradient (stops, true);
}
#else
if (frame_handle_start) {
if (position_locked) {
- frame_handle_start->set_fill_color (ARDOUR_UI::config()->get_TrimHandleLocked());
- frame_handle_end->set_fill_color (ARDOUR_UI::config()->get_TrimHandleLocked());
+ frame_handle_start->set_fill_color (UIConfiguration::instance().get_TrimHandleLocked());
+ frame_handle_end->set_fill_color (UIConfiguration::instance().get_TrimHandleLocked());
} else {
- frame_handle_start->set_fill_color (ARDOUR_UI::config()->get_TrimHandle());
- frame_handle_end->set_fill_color (ARDOUR_UI::config()->get_TrimHandle());
+ frame_handle_start->set_fill_color (UIConfiguration::instance().get_TrimHandle());
+ frame_handle_end->set_fill_color (UIConfiguration::instance().get_TrimHandle());
}
}
#endif
if (pixel_width < 2.0) {
- if (show_vestigial) {
-
- if (!vestigial_frame) {
- vestigial_frame = new ArdourCanvas::Rectangle (group, ArdourCanvas::Rect (0.0, 0.0, 2.0, trackview.current_height()));
- CANVAS_DEBUG_NAME (vestigial_frame, string_compose ("vestigial frame for %1", get_item_name()));
- vestigial_frame->set_outline_color (ARDOUR_UI::config()->color ("vestigial frame"));
- vestigial_frame->set_fill_color (ARDOUR_UI::config()->color ("vestigial frame"));
- vestigial_frame->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::LEFT|ArdourCanvas::Rectangle::RIGHT));
- }
-
- vestigial_frame->show();
- }
-
if (frame) {
- frame->hide();
+ frame->set_outline (false);
+ frame->set_x1 (std::max(1.0, pixel_width));
}
if (frame_handle_start) {
}
} else {
- if (vestigial_frame) {
- vestigial_frame->hide();
- }
-
if (frame) {
- frame->show();
+ frame->set_outline (true);
/* Note: x0 is always zero - the position is defined by
* the position of the group, not the frame.
*/
if (frame_handle_start) {
if (pixel_width < (3 * TimeAxisViewItem::GRAB_HANDLE_WIDTH)) {
/*
- * there's less than GRAB_HANDLE_WIDTH of the region between
+ * there's less than GRAB_HANDLE_WIDTH of the region between
* the right-hand end of frame_handle_start and the left-hand
* end of frame_handle_end, so disable the handles
*/
frame_handle_end->set_x0 (pixel_width - (TimeAxisViewItem::GRAB_HANDLE_WIDTH));
frame_handle_end->set_x1 (pixel_width);
frame_handle_end->show();
+
+ frame_handle_start->raise_to_top ();
+ frame_handle_end->raise_to_top ();
}
}
}
name_text->hide ();
return;
}
-
+
if (name_text->text().empty()) {
name_text->hide ();
}
projects / ardour.git / blobdiff