ardour/livetrax
13
0
Fork 0
Code

next modifier

Browse Source
This commit is contained in:
Paul Davis 2014-12-15 10:21:08 -05:00
parent 7b023f4ee0
commit 1fd681604e
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/audio_region_view.cc
View File

@ -315,7 +315,7 @@ AudioRegionView::fade_in_active_changed ()
if (audio_region()->fade_in_active()) {
start_xfade_rect->set_fill (false);
} else {
start_xfade_rect->set_fill_color (ARDOUR_UI::config()->color ("inactive crossfade"));
start_xfade_rect->set_fill_color (ARDOUR_UI::config()->color_mod ("inactive crossfade", "inactive crossfade"));
start_xfade_rect->set_fill (true);
}
}
@ -328,7 +328,7 @@ AudioRegionView::fade_out_active_changed ()
if (audio_region()->fade_out_active()) {
end_xfade_rect->set_fill (false);
} else {
end_xfade_rect->set_fill_color (ARDOUR_UI::config()->color ("inactive crossfade"));
end_xfade_rect->set_fill_color (ARDOUR_UI::config()->color_mod ("inactive crossfade", "inactive crossfade"));
end_xfade_rect->set_fill (true);
}
}

9
gtk2_ardour/dark.colors
View File

@ -397,9 +397,6 @@
<ColorAlias name="secondary delta clock: cursor" alias="color 9"/>
<ColorAlias name="secondary delta clock: edited text" alias="color 9"/>
<ColorAlias name="secondary delta clock: text" alias="color 92"/>
<ColorAlias name="selected crossfade editor line" alias="color 14"/>
<ColorAlias name="selected crossfade editor wave" alias="color 32"/>
<ColorAlias name="selected crossfade editor wave fill" alias="color 4"/>
<ColorAlias name="selected midi note color max" alias="color 62"/>
<ColorAlias name="selected midi note color mid" alias="color 93"/>
<ColorAlias name="selected midi note color min" alias="color 61"/>
@ -492,7 +489,11 @@
<Modifier name="ghost track base" modifier="= alpha:0.7764"/>
<Modifier name="audio bus base" modifier="= alpha:0.4078"/>
<Modifier name="range marker bar" modifier="= alpha:0.4078"/>
<Modifier name="modifier 32" modifier="= alpha:0.4666"/>
<Modifier name="inactive crossfade" modifier="= alpha:0.4666"/>
<Modifier name="midi note velocity text" modifier="= alpha:0.4666"/>
<Modifier name="midi sysex fill" modifier="= alpha:0.4666"/>
<Modifier name="verbose canvas cursor" modifier="= alpha:0.4666"/>
<Modifier name="modifier 45" modifier="= alpha:0.4627"/>
<Modifier name="modifier 5" modifier="= alpha:0.4078"/>
<Modifier name="modifier 51" modifier="= alpha:0.4"/>

2
gtk2_ardour/note_base.cc
View File

@ -96,7 +96,7 @@ NoteBase::show_velocity()
if (!_text) {
_text = new Text (_item->parent ());
_text->set_ignore_events (true);
_text->set_color (ARDOUR_UI::config()->color ("midi note velocity text"));
_text->set_color (ARDOUR_UI::config()->color_mod ("midi note velocity text", "midi note velocity text"));
_text->set_alignment (Pango::ALIGN_CENTER);
}

2
gtk2_ardour/sys_ex.cc
View File

@ -36,7 +36,7 @@ SysEx::SysEx (
parent,
height,
ARDOUR_UI::config()->color ("midi sysex outline"),
ARDOUR_UI::config()->color ("midi sysex fill"),
ARDOUR_UI::config()->color_mod ("midi sysex fill", "midi sysex fill"),
ArdourCanvas::Duple (x, y)
);

2
gtk2_ardour/verbose_cursor.cc
View File

@ -53,7 +53,7 @@ VerboseCursor::VerboseCursor (Editor* editor)
void
VerboseCursor::color_handler ()
{
_canvas_item->set_color (ARDOUR_UI::config()->color ("verbose canvas cursor"));
_canvas_item->set_color (ARDOUR_UI::config()->color_mod ("verbose canvas cursor", "verbose canvas cursor"));
}
ArdourCanvas::Item *