add a guess at appropriate color management for note velocity display

I think that HSV::opposite() is probably too strong here. HSV::darker() might be better. Experimentation needed.

diff --git a/libs/canvas/canvas/note.h b/libs/canvas/canvas/note.h
index 2dd3ac6a7bc436c01e46449246a32fda804f96bc..1b2083004267099dfabc1450c5342b991d0e490b 100644 (file)
--- a/libs/canvas/canvas/note.h
+++ b/libs/canvas/canvas/note.h
@@ -33,10 +33,12 @@ public:
 
        void render (Rect const &, Cairo::RefPtr<Cairo::Context>) const;
        void set_velocity (double fract);
+       void set_fill_color (Gtkmm2ext::Color);
 
   private:
-       static bool _show_velocity_bars;
-       double _velocity;
+       static bool      _show_velocity_bars;
+       double           _velocity;
+       Gtkmm2ext::Color _velocity_color;
 };
 
 }

diff --git a/libs/canvas/note.cc b/libs/canvas/note.cc
index 0d029b4bd0006c2c66761bad7b892e1c25ae8805..c27a93985a129204f8ee20b68a00fec5932d9e0d 100644 (file)
--- a/libs/canvas/note.cc
+++ b/libs/canvas/note.cc
@@ -30,13 +30,15 @@ bool Note::_show_velocity_bars = true;
 
 Note::Note (Canvas* c)
        : Rectangle (c)
-       , _velocity (0.5)
+       , _velocity (0.0)
+       , _velocity_color (0)
 {
 }
 
 Note::Note (Item* parent)
        : Rectangle (parent)
-       , _velocity (0.5)
+       , _velocity (0.0)
+       , _velocity_color (0)
 {
 }
 
@@ -78,8 +80,15 @@ Note::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
                        return;
                }
 
-               Gtkmm2ext::set_source_rgba (context, Gtkmm2ext::contrasting_text_color (fill_color()));
+               Gtkmm2ext::set_source_rgba (context, _velocity_color);
                context->rectangle (draw.x0, draw.y0, draw.width(), draw.height());
                context->fill ();
        }
 }
+
+void
+Note::set_fill_color (Gtkmm2ext::Color c)
+{
+       Fill::set_fill_color (c);
+       _velocity_color = Gtkmm2ext::HSV (c).opposite().color ();
+}