smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-08 22:55:44 +01:00
Code Issues Projects Releases Wiki Activity

theme skip drag rect; remove some debug output

Browse source
This commit is contained in:
Paul Davis 2014-09-22 12:28:22 -04:00
parent e29836232a
commit 998375bbfd
4 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gtk2_ardour/canvas_vars.h
View file

@ -130,6 +130,7 @@ CANVAS_VARIABLE(canvasvar_PianoRollWhite, "piano roll white")
CANVAS_VARIABLE(canvasvar_PlayHead, "play head")
CANVAS_VARIABLE(canvasvar_ProcessorAutomationLine, "processor automation line")
CANVAS_VARIABLE(canvasvar_PunchLine, "punch line")
CANVAS_VARIABLE(canvasvar_SkipDragBarRect, "skip drag bar rect")
CANVAS_VARIABLE(canvasvar_RangeDragBarRect, "range drag bar rect")
CANVAS_VARIABLE(canvasvar_RangeDragRect, "range drag rect")
CANVAS_VARIABLE(canvasvar_RangeMarkerBar, "range marker bar")

1
gtk2_ardour/default_ui_config.in
View file

@ -121,6 +121,7 @@
<Option name="play head" value="ffffffff"/>
<Option name="processor automation line" value="7aa3f9ff"/>
<Option name="punch line" value="a80000ff"/>
<Option name="skip drag bar rect" value="eb7801ff"/>
<Option name="range drag bar rect" value="ffffffff"/>
<Option name="range drag rect" value="ffffffff"/>
<Option name="range marker bar" value="575757ff"/>

4
gtk2_ardour/editor_canvas.cc
View file

@ -944,8 +944,8 @@ Editor::color_handler()
range_bar_drag_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_RangeDragBarRect());
range_bar_drag_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_RangeDragBarRect());
skip_drag_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_RangeDragBarRect());
skip_drag_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_RangeDragBarRect());
skip_drag_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_SkipDragBarRect());
skip_drag_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_SkipDragBarRect());
transport_bar_drag_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_TransportDragRect());
transport_bar_drag_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_TransportDragRect());

24
gtk2_ardour/editor_drag.cc
View file

@ -95,8 +95,6 @@ DragManager::abort ()
{
_ending = true;
cerr << "Aborting drag\n";
for (list<Drag*>::const_iterator i = _drags.begin(); i != _drags.end(); ++i) {
(*i)->abort ();
delete *i;
@ -3304,6 +3302,11 @@ MarkerDrag::motion (GdkEvent* event, bool)
return;
}
if (real_location->is_skip() ||
real_location->is_auto_loop()) {
move_both = true;
}
if (real_location->is_mark()) {
f_delta = newframe - copy_location->start();
} else {
@ -3314,6 +3317,7 @@ MarkerDrag::motion (GdkEvent* event, bool)
case Marker::RangeStart:
case Marker::LoopStart:
case Marker::PunchIn:
case Marker::Range:
f_delta = newframe - copy_location->start();
break;
@ -3339,7 +3343,7 @@ MarkerDrag::motion (GdkEvent* event, bool)
}
/* now move them all */
for (x = _copied_locations.begin(); x != _copied_locations.end(); ++x) {
copy_location = x->location;
@ -3366,7 +3370,7 @@ MarkerDrag::motion (GdkEvent* event, bool)
framepos_t new_end = copy_location->end() + f_delta;
if (is_start) { // start-of-range marker
if (move_both || (*x).move_both) {
copy_location->set_start (new_start);
copy_location->set_end (new_end);
@ -4432,8 +4436,16 @@ RangeMarkerBarDrag::RangeMarkerBarDrag (Editor* e, ArdourCanvas::Item* i, Operat
physical_screen_height (_editor->get_window())));
_drag_rect->hide ();
_drag_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_RangeDragRect());
_drag_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_RangeDragRect());
switch (o) {
case CreateSkipMarker:
_drag_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_SkipDragBarRect());
_drag_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_SkipDragBarRect());
break;
default:
_drag_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_RangeDragRect());
_drag_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_RangeDragRect());
break;
}
}
void