diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-12-15 10:32:17 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-12-15 10:32:17 -0500 |
| commit | 1ab2705b4b1af231a6c53a2cfcb07079df4b4f3d (patch) | |
| tree | a1efa9b83cb93b17dfc03a54f03010ea4915754d | |
| parent | 651fc9f68e93cc01c2db692fd5531b7ddeac4563 (diff) | |
next modifier
| -rw-r--r-- | gtk2_ardour/dark.colors | 10 | ||||
| -rw-r--r-- | gtk2_ardour/midi_region_view.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/patch_change.cc | 2 |
3 files changed, 6 insertions, 8 deletions
diff --git a/gtk2_ardour/dark.colors b/gtk2_ardour/dark.colors index cd6a25d34e..63b85c4098 100644 --- a/gtk2_ardour/dark.colors +++ b/gtk2_ardour/dark.colors @@ -63,7 +63,7 @@ <Color name="color 49" value="0x00660aff"/> <Color name="color 5" value="0x9dadc4ff"/> <Color name="color 50" value="0xeeeeecff"/> - <Color name="color 51" value="0x383d3766"/> + <Color name="color 51" value="0x383d37ff"/> <Color name="color 52" value="0xe8faa1ff"/> <Color name="color 53" value="0xf2c37dff"/> <Color name="color 54" value="0xf48352ff"/> @@ -73,7 +73,7 @@ <Color name="color 58" value="0x474f3fff"/> <Color name="color 59" value="0xb2baffff"/> <Color name="color 6" value="0x44bc50ff"/> - <Color name="color 60" value="0x50545aa0"/> + <Color name="color 60" value="0x50545aff"/> <Color name="color 61" value="0x20242ac0"/> <Color name="color 62" value="0x8894ff88"/> <Color name="color 63" value="0x5566ffff"/> @@ -274,8 +274,6 @@ <ColorAlias name="midi note selected" alias="color 59"/> <ColorAlias name="midi note velocity text" alias="color 32"/> <ColorAlias name="midi patch change fill" alias="color 60"/> - <ColorAlias name="midi patch change inactive channel fill" alias="color 60"/> - <ColorAlias name="midi patch change inactive channel outline" alias="color 61"/> <ColorAlias name="midi patch change outline" alias="color 26"/> <ColorAlias name="midi select rect fill" alias="color 62"/> <ColorAlias name="midi select rect outline" alias="color 63"/> @@ -497,8 +495,8 @@ <Modifier name="piano roll white" modifier="= alpha:0.4627"/> <Modifier name="audio track base" modifier="= alpha:0.4078"/> <Modifier name="automation track fill" modifier="= alpha:0.4078"/> - <Modifier name="modifier 51" modifier="= alpha:0.4"/> - <Modifier name="modifier 60" modifier="= alpha:0.6274"/> + <Modifier name="midi frame base" modifier="= alpha:0.4"/> + <Modifier name="midi patch change fill" modifier="= alpha:0.6274"/> <Modifier name="modifier 61" modifier="= alpha:0.7529"/> <Modifier name="modifier 62" modifier="= alpha:0.5333"/> <Modifier name="modifier 65" modifier="= alpha:0.3725"/> diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index 0d44a83e5e..2e1da30c37 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -3283,7 +3283,7 @@ MidiRegionView::set_frame_color() if (_selected) { f = ARDOUR_UI::config()->color ("selected region base"); } else if (high_enough_for_name) { - f= ARDOUR_UI::config()->color ("midi frame base"); + f= ARDOUR_UI::config()->color_mod ("midi frame base", "midi frame base"); } else { f = fill_color; } diff --git a/gtk2_ardour/patch_change.cc b/gtk2_ardour/patch_change.cc index 530f903bad..1701e66b56 100644 --- a/gtk2_ardour/patch_change.cc +++ b/gtk2_ardour/patch_change.cc @@ -59,7 +59,7 @@ PatchChange::PatchChange( parent, height, ARDOUR_UI::config()->color ("midi patch change outline"), - ARDOUR_UI::config()->color ("midi patch change fill"), + ARDOUR_UI::config()->color_mod ("midi patch change fill", "midi patch change fill"), ArdourCanvas::Duple (x, y) ); |