From 02b05f295ae02e535e088ee5706cb7ad069ec2bf Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 31 Aug 2022 13:53:43 -0600 Subject: [PATCH] use selected (outline) color for MIDI note velocity bar (thanks, cooltehno, for the idea) --- gtk2_ardour/note_base.cc | 2 +- libs/canvas/canvas/note.h | 1 + libs/canvas/note.cc | 8 +++++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/note_base.cc b/gtk2_ardour/note_base.cc index b525b8bac9..5cd88b7cce 100644 --- a/gtk2_ardour/note_base.cc +++ b/gtk2_ardour/note_base.cc @@ -175,7 +175,7 @@ NoteBase::set_selected(bool selected) const uint32_t base_col = base_color(); set_fill_color (base_col); - set_outline_color(calculate_outline(base_col, (_flags == Selected))); + set_outline_color(calculate_outline (base_col, (_flags == Selected))); } #define SCALE_USHORT_TO_UINT8_T(x) ((x) / 257) diff --git a/libs/canvas/canvas/note.h b/libs/canvas/canvas/note.h index 3c40df99fb..655c0b24e0 100644 --- a/libs/canvas/canvas/note.h +++ b/libs/canvas/canvas/note.h @@ -34,6 +34,7 @@ public: void render (Rect const &, Cairo::RefPtr) const; void set_velocity (double fract); void set_fill_color (Gtkmm2ext::Color); + void set_outline_color (Gtkmm2ext::Color); static void set_show_velocity_bars (bool); diff --git a/libs/canvas/note.cc b/libs/canvas/note.cc index 8b34caf1c8..3d9a94412e 100644 --- a/libs/canvas/note.cc +++ b/libs/canvas/note.cc @@ -97,5 +97,11 @@ void Note::set_fill_color (Gtkmm2ext::Color c) { Fill::set_fill_color (c); - _velocity_color = UINT_INTERPOLATE (c, 0x000000ff, 0.5); +} + +void +Note::set_outline_color (Gtkmm2ext::Color c) +{ + Outline::set_outline_color (c); + _velocity_color = c; }