smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-24 07:27:44 +01:00
Code Issues Projects Releases Wiki Activity

change the way MIDI note colors are defined (2 3-point color ranges, one for selected, one for unselected); change default scroll action on selected midi notes to "fine" adjustment rather than "coarse" (now alt-scroll)

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@7302 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2010-06-24 21:22:00 +00:00
parent 806a22fefe
commit db55b149eb
6 changed files with 68 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

32
gtk2_ardour/canvas-note-event.cc
View file

@ -172,17 +172,17 @@ CanvasNoteEvent::set_selected(bool selected)
{
if (!_note) {
return;
} else if (selected) {
set_fill_color(UINT_INTERPOLATE(base_color(),
ARDOUR_UI::config()->canvasvar_MidiNoteSelected.get(), 0.5));
set_outline_color(calculate_outline(
ARDOUR_UI::config()->canvasvar_MidiNoteSelected.get()));
}
_selected = selected;
set_fill_color (base_color ());
if (_selected) {
set_outline_color(calculate_outline(ARDOUR_UI::config()->canvasvar_MidiNoteSelected.get()));
} else {
set_fill_color(base_color());
set_outline_color(calculate_outline(base_color()));
}
_selected = selected;
}
#define SCALE_USHORT_TO_UINT8_T(x) ((x) / 257)
@ -201,19 +201,21 @@ CanvasNoteEvent::base_color()
case TrackColor:
{
Gdk::Color color = _region.midi_stream_view()->get_region_color();
return RGBA_TO_UINT(
SCALE_USHORT_TO_UINT8_T(color.get_red()),
SCALE_USHORT_TO_UINT8_T(color.get_green()),
SCALE_USHORT_TO_UINT8_T(color.get_blue()),
opacity);
return UINT_INTERPOLATE (RGBA_TO_UINT(
SCALE_USHORT_TO_UINT8_T(color.get_red()),
SCALE_USHORT_TO_UINT8_T(color.get_green()),
SCALE_USHORT_TO_UINT8_T(color.get_blue()),
opacity),
ARDOUR_UI::config()->canvasvar_MidiNoteSelected.get(), 0.5);
}
case ChannelColors:
return UINT_RGBA_CHANGE_A(CanvasNoteEvent::midi_channel_colors[_note->channel()],
opacity);
return UINT_INTERPOLATE (UINT_RGBA_CHANGE_A (CanvasNoteEvent::midi_channel_colors[_note->channel()],
opacity),
ARDOUR_UI::config()->canvasvar_MidiNoteSelected.get(), 0.5);
default:
return meter_style_fill_color(_note->velocity());
return meter_style_fill_color(_note->velocity(), selected());
};
return 0;