#include "ardour/session.h"
#include "ardour/tempo.h"
+#include "gtkmm2ext/colors.h"
#include "gtkmm2ext/gui_thread.h"
#include "gtkmm2ext/keyboard.h"
-#include "canvas/colors.h"
-#include "canvas/utils.h"
+#include "widgets/tooltips.h"
#include "ardour_ui.h"
#include "public_editor.h"
#include "main_clock.h"
#include "mini_timeline.h"
#include "timers.h"
-#include "tooltips.h"
#include "ui_config.h"
#include "pbd/i18n.h"
Location::start_changed.connect (marker_connection, invalidator (*this), boost::bind (&MiniTimeline::update_minitimeline, this), gui_context ());
Location::flags_changed.connect (marker_connection, invalidator (*this), boost::bind (&MiniTimeline::update_minitimeline, this), gui_context ());
- ARDOUR_UI_UTILS::set_tooltip (*this,
- string_compose (_("<b>Navigation Timeline</b>. Use left-click to locate to time position or marker; scroll-wheel to jump, hold %1 for fine gained and %2 + %3 for extra-fine grained control. Right-click to set display range. The display unit is defined by the primary clock."),
+ ArdourWidgets::set_tooltip (*this,
+ string_compose (_("<b>Navigation Timeline</b>. Use left-click to locate to time position or marker; scroll-wheel to jump, hold %1 for fine grained and %2 + %3 for extra-fine grained control. Right-click to set display range. The display unit is defined by the primary clock."),
Gtkmm2ext::Keyboard::primary_modifier_name(),
Gtkmm2ext::Keyboard::primary_modifier_name (),
Gtkmm2ext::Keyboard::secondary_modifier_name ()));
}
void
-MiniTimeline::draw_dots (cairo_t* cr, int left, int right, int y, ArdourCanvas::Color color)
+MiniTimeline::draw_dots (cairo_t* cr, int left, int right, int y, Gtkmm2ext::Color color)
{
if (left + 1 >= right) {
return;
}
cairo_move_to (cr, left + .5, y + .5);
cairo_line_to (cr, right - .5, y + .5);
- ArdourCanvas::set_source_rgb_a(cr, color, 0.3);
+ Gtkmm2ext::set_source_rgb_a(cr, color, 0.3);
const double dashes[] = { 0, 1 };
cairo_set_dash (cr, dashes, 2, 1);
cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
prelight ? "entered marker" : "location marker");
double r, g, b, a;
- ArdourCanvas::color_to_rgba (color, r, g, b, a);
+ Gtkmm2ext::color_to_rgba (color, r, g, b, a);
if (rw < x0) {
rw = x1;
}
int
-MiniTimeline::draw_edge (cairo_t* cr, int x0, int x1, bool left, const std::string&, bool& prelight)
+MiniTimeline::draw_edge (cairo_t* cr, int x0, int x1, bool left, const std::string& label, bool& prelight)
{
int h = _marker_height;
int w2 = (h - 1) / 4;
const double yc = rint (h * .5);
const double dy = h * .4;
+ bool with_label;
+ int lw, lh, lx;
+ _layout->set_text (label);
+ _layout->get_pixel_size (lw, lh);
+
double px, dx;
if (left) {
- x1 = std::min (x1, x0 + 2 * w2);
+ if (x0 + 2 * w2 + lw + 2 < x1) {
+ x1 = std::min (x1, x0 + 2 * w2 + lw + 2);
+ with_label = true;
+ } else {
+ x1 = std::min (x1, x0 + 2 * w2);
+ with_label = false;
+ }
px = x0;
dx = 2 * w2;
+ lx = x0 + dx;
} else {
- x0 = std::max (x0, x1 - 2 * w2);
+ if (x1 - 2 * w2 - lw - 2 > x0) {
+ x0 = std::max (x0, x1 - 2 * w2 - lw - 2);
+ with_label = true;
+ } else {
+ x0 = std::max (x0, x1 - 2 * w2);
+ with_label = false;
+ }
px = x1;
dx = -2 * w2;
+ lx = x1 + dx - lw - 2;
}
+
if (x1 - x0 < 2 * w2) {
return left ? x0 : x1;
}
prelight ? "entered marker" : "location marker");
double r, g, b, a;
- ArdourCanvas::color_to_rgba (color, r, g, b, a);
+ Gtkmm2ext::color_to_rgba (color, r, g, b, a);
+
+ if (with_label) {
+ const int y = PADDING;
+ cairo_save (cr);
+ cairo_rectangle (cr, lx, y, lw + 2, h);
+ cairo_set_source_rgba (cr, r, g, b, 0.5); // this should use a shaded color
+ cairo_fill_preserve (cr);
+ cairo_clip (cr);
+
+ // marker label
+ cairo_move_to (cr, lx + 1, y + .5 * (h - lh));
+ cairo_set_source_rgb (cr, 0, 0, 0);
+ pango_cairo_show_layout (cr, _layout->gobj());
+ cairo_restore (cr);
+ }
// draw arrow
cairo_move_to (cr, px - .5, PADDING + yc - .5);
{
cairo_t* cr = ctx->cobj();
// TODO cache, set_colors()
- ArdourCanvas::Color base = UIConfiguration::instance().color ("ruler base");
- ArdourCanvas::Color text = UIConfiguration::instance().color ("ruler text");
+ Gtkmm2ext::Color base = UIConfiguration::instance().color ("ruler base");
+ Gtkmm2ext::Color text = UIConfiguration::instance().color ("ruler text");
if (_n_labels == 0) {
return;
const int height = get_height ();
Gtkmm2ext::rounded_rectangle (cr, 0, 0, width, height, 4);
- ArdourCanvas::set_source_rgba(cr, base);
+ Gtkmm2ext::set_source_rgba(cr, base);
cairo_fill (cr);
Gtkmm2ext::rounded_rectangle (cr, PADDING, PADDING, width - PADDING - PADDING, height - PADDING - PADDING, 4);
draw_dots (cr, dot_left, x0, y0 + _time_height * .5, text);
cairo_move_to (cr, x0, y0);
- ArdourCanvas::set_source_rgba(cr, text);
+ Gtkmm2ext::set_source_rgba(cr, text);
pango_cairo_show_layout (cr, _layout->gobj());
dot_left = x0 + lw;
}
std::vector<LocationMarker>::const_iterator outside_left = lm.end();
std::vector<LocationMarker>::const_iterator outside_right = lm.end();
int left_limit = 0;
- int right_limit = 0;
+ int right_limit = width * .5 + mw;
int id = 0;
for (std::vector<LocationMarker>::const_iterator l = lm.begin(); l != lm.end(); ++id) {
if (++l != lm.end()) {
left_limit = floor (width * .5 + ((*l).when - p) * _px_per_sample) - 1 - mw;
} else {
- left_limit = width;
+ left_limit = width * .5 - mw;
}
continue;
}
bool prelight = false;
x1 = draw_mark (cr, x0, x1, label, prelight);
_jumplist.push_back (JumpRange (x0 - mw, x1, when, prelight));
- right_limit = x1;
+ right_limit = std::max (x1, right_limit);
}
if (outside_left != lm.end ()) {
if (left_limit > 3 * mw + PADDING) {
int x0 = PADDING + 1;
- int x1 = left_limit;
+ int x1 = left_limit - mw;
bool prelight = false;
x1 = draw_edge (cr, x0, x1, true, (*outside_left).label, prelight);
if (x0 != x1) {
projects / ardour.git / blobdiff