summaryrefslogtreecommitdiff
path: root/gtk2_ardour/marker.cc
diff options
context:
space:
mode:
authornick_m <mainsbridge@gmail.com>2016-08-20 04:36:52 +1000
committernick_m <mainsbridge@gmail.com>2016-08-20 04:36:52 +1000
commit869a9cb5df0a270adb184a59d52951ea26cfa750 (patch)
treed3078f571f3c5b0cb43339ece47d204885fff8f3 /gtk2_ardour/marker.cc
parent949dd8245d1f6c6b0f6815d9f0bd911c38cbfe89 (diff)
Swap tempo/meter colours when hovering. Use entered marker for these as well.
- Note : entered_marker modifies the 'p' press, locating to the currently hovered-over marker.
Diffstat (limited to 'gtk2_ardour/marker.cc')
-rw-r--r--gtk2_ardour/marker.cc40
1 files changed, 40 insertions, 0 deletions
diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc
index 87c0c06ab2..9e05e1e4d6 100644
--- a/gtk2_ardour/marker.cc
+++ b/gtk2_ardour/marker.cc
@@ -556,6 +556,26 @@ TempoMarker::update_height_mark (const double& ratio)
mark->set (*points);
}
+void
+TempoMarker::set_enter_color ()
+{
+ if (_tempo.position_lock_style() == MusicTime) {
+ set_color_rgba (UIConfiguration::instance().color ("tempo marker"));
+ } else {
+ set_color_rgba (UIConfiguration::instance().color ("tempo marker music"));
+ }
+}
+
+void
+TempoMarker::set_leave_color ()
+{
+ if (_tempo.position_lock_style() == MusicTime) {
+ set_color_rgba (UIConfiguration::instance().color ("tempo marker music"));
+ } else {
+ set_color_rgba (UIConfiguration::instance().color ("tempo marker"));
+ }
+}
+
/***********************************************************************/
MeterMarker::MeterMarker (PublicEditor& editor, ArdourCanvas::Container& parent, guint32 rgba, const string& text,
@@ -571,3 +591,23 @@ MeterMarker::~MeterMarker ()
{
}
+void
+MeterMarker::set_enter_color ()
+{
+ if (_meter.position_lock_style() == MusicTime) {
+ set_color_rgba (UIConfiguration::instance().color ("meter marker"));
+ } else {
+ set_color_rgba (UIConfiguration::instance().color ("meter marker music"));
+ }
+}
+
+void
+MeterMarker::set_leave_color ()
+{
+ if (_meter.position_lock_style() == MusicTime) {
+ set_color_rgba (UIConfiguration::instance().color ("meter marker music"));
+ } else {
+ set_color_rgba (UIConfiguration::instance().color ("meter marker"));
+ }
+}
+