add back definition of 2ndary clock delta text color

[ardour.git] / gtk2_ardour / audio_clock.cc

diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc
index 2a2cee60d37aad287b199daf728beeac37becba7..2dfdf77272e3bf254cc3b2dc7ffd53f28340c894 100644 (file)
--- a/gtk2_ardour/audio_clock.cc
+++ b/gtk2_ardour/audio_clock.cc
@@ -1373,6 +1373,9 @@ AudioClock::on_key_press_event (GdkEventKey* ev)
        case GDK_KP_Subtract:
                if (_negative_allowed && input_string.empty()) {
                                edit_is_negative = true;
+                               edit_string.replace(0,1,"-");
+                               _layout->set_text (edit_string);
+                               queue_draw ();
                } else {
                        end_edit_relative (false);
                }
@@ -1440,6 +1443,16 @@ AudioClock::on_key_press_event (GdkEventKey* ev)
                highlight_length = merge_input_and_edit_string ();
        }
 
+       if (edit_is_negative) {
+               edit_string.replace(0,1,"-");
+       } else {
+               if (pre_edit_string.at(0) == '-') {
+                       edit_string.replace(0,1,"_");
+               } else {
+                       edit_string.replace(0,1," ");
+               }
+       }
+
        show_edit_status (highlight_length);
        _layout->set_text (edit_string);
        queue_draw ();
@@ -1721,7 +1734,7 @@ AudioClock::on_scroll_event (GdkEventScroll *ev)
                                frames *= 10;
                        }
 
-                       if ((double)current_time() - (double)frames < 0.0) {
+                       if (!_negative_allowed && (double)current_time() - (double)frames < 0.0) {
                                set (0, true);
                        } else {
                                set (current_time() - frames, true);