smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-18 04:36:30 +01:00
Code Issues Projects Releases Wiki Activity

change the way the audio clock cursor is drawn (somewhat of an experiment but it has some benefits

Browse source
This commit is contained in:
Paul Davis 2015-09-22 18:25:14 -04:00
parent 3e0d801509
commit 601770837e
1 changed files with 42 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

64
gtk2_ardour/audio_clock.cc
View file

@ -198,6 +198,7 @@ AudioClock::set_font (Pango::FontDescription font)
tmp->set_text ("8"); tmp->set_text ("8");
tmp->get_pixel_size (em_width, ignore_height); tmp->get_pixel_size (em_width, ignore_height);
/* force redraw of markup with new font-size */ /* force redraw of markup with new font-size */
set (last_when, true); set (last_when, true);
} }
@ -312,7 +313,11 @@ AudioClock::render (cairo_t* cr, cairo_rectangle_t*)
double lw = layout_width * xscale; double lw = layout_width * xscale;
double lh = layout_height * yscale; double lh = layout_height * yscale;
cairo_move_to (cr, (get_width() - lw) / 2.0, (upper_height - lh) / 2.0); if (lw >= get_width()) {
cairo_move_to (cr, 0.0, (upper_height - lh) / 2.0);
} else {
cairo_move_to (cr, (get_width() - lw) / 2.0, (upper_height - lh) / 2.0);
}
if (xscale != 1.0 || yscale != 1.0) { if (xscale != 1.0 || yscale != 1.0) {
cairo_save (cr); cairo_save (cr);
@ -401,42 +406,44 @@ AudioClock::render (cairo_t* cr, cairo_rectangle_t*)
} }
if (editing) { if (editing) {
Pango::Rectangle cursor;
if (!insert_map.empty()) { if (!insert_map.empty()) {
int xcenter = (get_width() - layout_width) /2;
if (input_string.length() < insert_map.size()) { if (input_string.length() < insert_map.size()) {
Pango::Rectangle cursor;
if (input_string.empty()) { cursor = _layout->get_cursor_strong_pos (edit_string.length() - 1);
/* nothing entered yet, put cursor at the end
of string
*/
cursor = _layout->get_cursor_strong_pos (edit_string.length() - 1);
} else {
cursor = _layout->get_cursor_strong_pos (insert_map[input_string.length()]);
}
cairo_set_source_rgba (cr, cursor_r, cursor_g, cursor_b, cursor_a); cairo_set_source_rgba (cr, cursor_r, cursor_g, cursor_b, cursor_a);
cairo_rectangle (cr, cairo_rectangle (cr,
min (get_width() - 2.0, cursor.get_x()/PANGO_SCALE,
(double) xcenter + cursor.get_x()/PANGO_SCALE + em_width), (upper_height - layout_height)/2.0,
(upper_height - layout_height)/2.0, em_width,
2.0, cursor.get_height()/PANGO_SCALE); cursor.get_height()/PANGO_SCALE);
cairo_fill (cr); cairo_stroke (cr);
} else { } else {
/* we've entered all possible digits, no cursor */ /* we've entered all possible digits, no cursor */
} }
} else { } else {
if (input_string.empty()) { cairo_set_source_rgba (cr, cursor_r, cursor_g, cursor_b, cursor_a);
cairo_set_source_rgba (cr, cursor_r, cursor_g, cursor_b, cursor_a);
if (edit_string.empty()) {
cairo_rectangle (cr, cairo_rectangle (cr,
(get_width()/2.0), get_width() - em_width,
(upper_height - layout_height)/2.0, (upper_height - layout_height)/2.0,
2.0, upper_height); em_width, upper_height);
cairo_fill (cr); } else {
cursor = _layout->get_cursor_strong_pos (edit_string.length() - 1);
cairo_rectangle (cr,
cursor.get_x()/PANGO_SCALE,
(upper_height - layout_height)/2.0,
em_width, upper_height);
} }
cairo_stroke (cr);
} }
} }
} }
@ -477,8 +484,19 @@ AudioClock::set_clock_dimensions (Gtk::Requisition& req)
tmp->set_text (" 88:88:88,88 "); tmp->set_text (" 88:88:88,88 ");
tmp->get_pixel_size (req.width, req.height); tmp->get_pixel_size (req.width, req.height);
layout_height = req.height; layout_height = req.height;
layout_width = req.width; layout_width = req.width;
/* get the figure width for the font. This doesn't have to super
* accurate since we only use it to measure the (roughly 1 character)
* offset from the position Pango tells us for the "cursor"
*/
int ignore_height;
tmp->set_text ("8");
tmp->get_pixel_size (em_width, ignore_height);
} }
void void