ardour/livetrax
13
0
Fork 0
Code

obey note name display preference

Browse Source
This commit is contained in:
Paul Davis 2023-08-18 10:59:22 -06:00
parent b81da94fa2
commit 71f168834d
1 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
gtk2_ardour/piano_roll_header.cc
View File

@ -283,43 +283,47 @@ PianoRollHeader::on_expose_event (GdkEventExpose* ev)
cr->rectangle (0,0,_scroomer_size, get_height () ); cr->rectangle (0,0,_scroomer_size, get_height () );
cr->clip(); cr->clip();
/* Now draw the actual text */ if (UIConfiguration::instance().get_note_name_display() != Editing::Never) {
for (int i = lowest; i <= highest; ++i) {
int size_x, size_y;
double y = floor(_view.note_to_y(i)) - 0.5f;
midnamName note = get_note_name (i);
_midnam_layout->set_text (note.name); /* Draw the actual text */
cr->set_source_rgb(white.r, white.g, white.b); for (int i = lowest; i <= highest; ++i) {
cr->move_to(2.f, y); int size_x, size_y;
double y = floor(_view.note_to_y(i)) - 0.5f;
midnamName note = get_note_name (i);
if (!_mini_map_display) { _midnam_layout->set_text (note.name);
_midnam_layout->show_in_cairo_context (cr);
} else { cr->set_source_rgb(white.r, white.g, white.b);
/* Too small for text, just show a thing rect where the cr->move_to(2.f, y);
text would have been.
*/ if (!_mini_map_display) {
if (!note.from_midnam) { _midnam_layout->show_in_cairo_context (cr);
cr->set_source_rgb(gray.r, gray.g, gray.b); } else {
/* Too small for text, just show a thing rect where the
text would have been.
*/
if (!note.from_midnam) {
cr->set_source_rgb(gray.r, gray.g, gray.b);
}
pango_layout_get_pixel_size (_midnam_layout->gobj (), &size_x, &size_y);
cr->rectangle (2.f, y + (av_note_height * 0.5), size_x, av_note_height * 0.2);
cr->fill ();
} }
pango_layout_get_pixel_size (_midnam_layout->gobj (), &size_x, &size_y);
cr->rectangle (2.f, y + (av_note_height * 0.5), size_x, av_note_height * 0.2);
cr->fill ();
} }
}
/* Add a gradient over the text, to act as a sort of "visual /* Add a gradient over the text, to act as a sort of "visual
elision". This avoids using text elision with "..." which takes up too elision". This avoids using text elision with "..." which takes up too
much space. much space.
*/ */
double fade_width = 30.; double fade_width = 30.;
auto gradient_ptr = Cairo::LinearGradient::create (_scroomer_size - fade_width, 0, _scroomer_size, 0); auto gradient_ptr = Cairo::LinearGradient::create (_scroomer_size - fade_width, 0, _scroomer_size, 0);
gradient_ptr->add_color_stop_rgba (0,.23,.23,.23,0); gradient_ptr->add_color_stop_rgba (0,.23,.23,.23,0);
gradient_ptr->add_color_stop_rgba (1,.23,.23,.23,1); gradient_ptr->add_color_stop_rgba (1,.23,.23,.23,1);
cr->set_source (gradient_ptr); cr->set_source (gradient_ptr);
cr->rectangle (_scroomer_size - fade_width, 0, _scroomer_size, get_height () ); cr->rectangle (_scroomer_size - fade_width, 0, _scroomer_size, get_height () );
cr->fill(); cr->fill();
}
/* Now draw the semi-transparent scroomer over the top */ /* Now draw the semi-transparent scroomer over the top */