From eafbb805013140c8e85478717ca3d7acd5b39608 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sun, 20 Jan 2013 03:47:01 +0000
Subject: [PATCH] Make patch changes stand out a little better while also being
 more monochromatic.

The colour on the text doesn't seem to be what it should be, though.  I think
Gtkmm2ext::convert_bgra_to_rgba might be broken...


git-svn-id: svn://localhost/ardour2/branches/3.0@13916 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/ardour3_ui_default.conf |  8 ++++----
 gtk2_ardour/canvas_patch_change.cc  | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/gtk2_ardour/ardour3_ui_default.conf b/gtk2_ardour/ardour3_ui_default.conf
index 8b781e75c6..dc30f39597 100644
--- a/gtk2_ardour/ardour3_ui_default.conf
+++ b/gtk2_ardour/ardour3_ui_default.conf
@@ -71,10 +71,10 @@
     <Option name="selected midi note color max" value="8383deff"/>
     <Option name="midi note selected" value="b2b2ffff"/>
     <Option name="midi note velocity text" value="f4f214bc"/>
-    <Option name="midi patch change fill" value="0000ffa0"/>
-    <Option name="midi patch change outline" value="a7a7d4ff"/>
-    <Option name="midi patch change inactive channel fill" value="00000000"/>
-    <Option name="midi patch change inactive channel outline" value="222222ff"/>
+    <Option name="midi patch change fill" value="50555AA0"/>
+    <Option name="midi patch change outline" value="C0C5CAFF"/>
+    <Option name="midi patch change inactive channel fill" value="50555AC0"/>
+    <Option name="midi patch change inactive channel outline" value="20252AC0"/>
     <Option name="midi sysex fill" value="f1e139a0"/>
     <Option name="midi sysex outline" value="a7a7d4ff"/>
     <Option name="midi select rect fill" value="8888ff88"/>
diff --git a/gtk2_ardour/canvas_patch_change.cc b/gtk2_ardour/canvas_patch_change.cc
index 2678868e02..1958ea2b5e 100644
--- a/gtk2_ardour/canvas_patch_change.cc
+++ b/gtk2_ardour/canvas_patch_change.cc
@@ -53,12 +53,12 @@ CanvasPatchChange::CanvasPatchChange(
 		region,
 		parent,
 		height,
-		active_channel ?
-		ARDOUR_UI::config()->canvasvar_MidiPatchChangeOutline.get() :
-		ARDOUR_UI::config()->canvasvar_MidiPatchChangeInactiveChannelOutline.get(),
-		active_channel ?
-		ARDOUR_UI::config()->canvasvar_MidiPatchChangeFill.get() :
-		ARDOUR_UI::config()->canvasvar_MidiPatchChangeInactiveChannelFill.get(),
+		(active_channel
+		 ? ARDOUR_UI::config()->canvasvar_MidiPatchChangeOutline.get()
+		 : ARDOUR_UI::config()->canvasvar_MidiPatchChangeInactiveChannelOutline.get()),
+		(active_channel
+		 ? ARDOUR_UI::config()->canvasvar_MidiPatchChangeFill.get()
+		 : ARDOUR_UI::config()->canvasvar_MidiPatchChangeInactiveChannelFill.get()),
 		x,
 		y)
 	, _info (info)