diff options
| author | David Robillard <d@drobilla.net> | 2007-06-16 23:55:23 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-06-16 23:55:23 +0000 |
| commit | a7ad62439203ef4060547ec70cc6236c5df67ae5 (patch) | |
| tree | 18964c82e84532a3b965555a032c143423744ed8 | |
| parent | 0df86069c745addb6e5bad4cc1b3fd90b849710a (diff) | |
Fix time canvas separator lines.
git-svn-id: svn://localhost/ardour2/trunk@1994 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | ardour.rc.in | 1 | ||||
| -rw-r--r-- | gtk2_ardour/editor_canvas.cc | 10 | ||||
| -rw-r--r-- | libs/ardour/ardour/canvas_vars.h | 1 |
3 files changed, 7 insertions, 5 deletions
diff --git a/ardour.rc.in b/ardour.rc.in index d99c409cb0..662fdeed40 100644 --- a/ardour.rc.in +++ b/ardour.rc.in @@ -79,6 +79,7 @@ <Option name="location punch" value="7c3a3aff"/> <Option name="verbose canvas cursor" value="f4f214bc"/> <Option name="marker label" value="000000ff"/> + <Option name="marker bar separator" value="30303088"/> <Option name="tempo bar" value="72727fff"/> <Option name="meterbar" value="666672ff"/> <Option name="markerbar" value="7f7f8cff"/> diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index 2aa76d4a85..c757d6cfd3 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -705,19 +705,19 @@ Editor::color_handler() verbose_canvas_cursor->property_fill_color_rgba() = Config->canvasvar_VerboseCanvasCursor.get(); meter_bar->property_fill_color_rgba() = Config->canvasvar_MeterBar.get(); - meter_bar->property_outline_color_rgba() = Config->canvasvar_MeterBar.get(); + meter_bar->property_outline_color_rgba() = Config->canvasvar_MarkerBarSeparator.get(); tempo_bar->property_fill_color_rgba() = Config->canvasvar_TempoBar.get(); - tempo_bar->property_outline_color_rgba() = Config->canvasvar_TempoBar.get(); + tempo_bar->property_outline_color_rgba() = Config->canvasvar_MarkerBarSeparator.get(); marker_bar->property_fill_color_rgba() = Config->canvasvar_MarkerBar.get(); - marker_bar->property_outline_color_rgba() = Config->canvasvar_MarkerBar.get(); + marker_bar->property_outline_color_rgba() = Config->canvasvar_MarkerBarSeparator.get(); range_marker_bar->property_fill_color_rgba() = Config->canvasvar_RangeMarkerBar.get(); - range_marker_bar->property_outline_color_rgba() = Config->canvasvar_RangeMarkerBar.get(); + range_marker_bar->property_outline_color_rgba() = Config->canvasvar_MarkerBarSeparator.get(); transport_marker_bar->property_fill_color_rgba() = Config->canvasvar_TransportMarkerBar.get(); - transport_marker_bar->property_outline_color_rgba() = Config->canvasvar_TransportMarkerBar.get(); + transport_marker_bar->property_outline_color_rgba() = Config->canvasvar_MarkerBarSeparator.get(); range_bar_drag_rect->property_fill_color_rgba() = Config->canvasvar_RangeDragBarRect.get(); range_bar_drag_rect->property_outline_color_rgba() = Config->canvasvar_RangeDragBarRect.get(); diff --git a/libs/ardour/ardour/canvas_vars.h b/libs/ardour/ardour/canvas_vars.h index 4e83131920..35af35e2ac 100644 --- a/libs/ardour/ardour/canvas_vars.h +++ b/libs/ardour/ardour/canvas_vars.h @@ -37,6 +37,7 @@ CANVAS_VARIABLE(canvasvar_LocationLoop, "location loop") CANVAS_VARIABLE(canvasvar_LocationPunch, "location punch") CANVAS_VARIABLE(canvasvar_VerboseCanvasCursor, "verbose canvas cursor") CANVAS_VARIABLE(canvasvar_MarkerLabel, "marker label") +CANVAS_VARIABLE(canvasvar_MarkerBarSeparator, "marker bar separator") CANVAS_VARIABLE(canvasvar_TempoBar, "tempo bar") CANVAS_VARIABLE(canvasvar_MeterBar, "meterbar") CANVAS_VARIABLE(canvasvar_MarkerBar, "markerbar") |