diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-09 23:28:32 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-09 23:29:00 -0400 |
commit | ce08ec0de0b0b077d9b28533c23886607991d144 (patch) | |
tree | 031a01c89075fbf90733da202ce8b19f6f048a6c /gtk2_ardour/streamview.h | |
parent | 438179d278559bcb41a8abdadfb5e6b2e1e89d2d (diff) |
substantial changes in color management, involving a reduction in the use of Gdk::Color and more consistent logic for region coloring.
Group tabs now also get the text drawn in an appropriately contrast-y color
Diffstat (limited to 'gtk2_ardour/streamview.h')
-rw-r--r-- | gtk2_ardour/streamview.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h index e7608cb02c..e0d60baf34 100644 --- a/gtk2_ardour/streamview.h +++ b/gtk2_ardour/streamview.h @@ -89,8 +89,9 @@ public: StreamBaseColor }; - Gdk::Color get_region_color () const { return region_color; } - void apply_color (Gdk::Color, ColorTarget t); + uint32_t get_region_color () const { return region_color; } + void apply_color (uint32_t, ColorTarget t); + void apply_color (Gdk::Color const &, ColorTarget t); uint32_t num_selected_regionviews () const; @@ -164,8 +165,8 @@ protected: bool rec_updating; bool rec_active; - Gdk::Color region_color; ///< Contained region color - uint32_t stream_base_color; ///< Background color + uint32_t region_color; ///< Contained region color + uint32_t stream_base_color; ///< Background color PBD::ScopedConnectionList playlist_connections; PBD::ScopedConnection playlist_switched_connection; |