From 9ac7ddb31d3d4633716a9ec1a99d21ca27878744 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sun, 7 Dec 2014 13:55:40 -0500 Subject: remove all explicit button text colors; use contrasting_text_color() instead. Also, use a slightly off-white rather than pure white, which should really be configurable --- gtk2_ardour/ardour_button.cc | 4 ++-- gtk2_ardour/color_aliases.h | 50 -------------------------------------------- 2 files changed, 2 insertions(+), 52 deletions(-) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/ardour_button.cc b/gtk2_ardour/ardour_button.cc index ddd8b9ca3e..f4dbc830f6 100644 --- a/gtk2_ardour/ardour_button.cc +++ b/gtk2_ardour/ardour_button.cc @@ -666,8 +666,8 @@ ArdourButton::set_colors () fill_active_color = ARDOUR_UI::config()->color (string_compose ("%1: fill active", name)); fill_inactive_color = ARDOUR_UI::config()->color (string_compose ("%1: fill", name)); - text_active_color = ARDOUR_UI::config()->color (string_compose ("%1: text active", name)); - text_inactive_color = ARDOUR_UI::config()->color (string_compose ("%1: text", name)); + text_active_color = ArdourCanvas::contrasting_text_color (fill_active_color); + text_inactive_color = ArdourCanvas::contrasting_text_color (fill_inactive_color); led_active_color = ARDOUR_UI::config()->color (string_compose ("%1: led active", name)); led_inactive_color = ARDOUR_UI::config()->color (string_compose ("%1: led", name)); diff --git a/gtk2_ardour/color_aliases.h b/gtk2_ardour/color_aliases.h index 4338b8fe65..ad681f6727 100644 --- a/gtk2_ardour/color_aliases.h +++ b/gtk2_ardour/color_aliases.h @@ -51,8 +51,6 @@ COLOR_ALIAS(GenericButtonFillActive,"generic button: fill","color 25") COLOR_ALIAS(GenericButtonFill,"generic button: fill active","color 9") COLOR_ALIAS(GenericButtonLEDActive,"generic button: led","color 15") COLOR_ALIAS(GenericButtonLED,"generic button: led active","color 18") -COLOR_ALIAS(GenericButtonTextActive,"generic button: text","color 26") -COLOR_ALIAS(GenericButtonText,"generic button: text active","color 27") COLOR_ALIAS(GhostTrackBase,"ghost track base","color 28") COLOR_ALIAS(GhostTrackMidiOutline,"ghost track midi outline","color 4") COLOR_ALIAS(GhostTrackWaveClip,"ghost track wave","color 29") @@ -107,8 +105,6 @@ COLOR_ALIAS(InvertButtonFillActive,"invert button: fill","color 25") COLOR_ALIAS(InvertButtonFill,"invert button: fill active","color 35") COLOR_ALIAS(InvertButtonLEDActive,"invert button: led","color 36") COLOR_ALIAS(InvertButtonLED,"invert button: led active","color 37") -COLOR_ALIAS(InvertButtonTextActive,"invert button: text","color 26") -COLOR_ALIAS(InvertButtonText,"invert button: text active","color 33") COLOR_ALIAS(LocationCDMarker,"location cd marker","color 38") COLOR_ALIAS(LocationLoop,"location loop","color 39") COLOR_ALIAS(LocationMarker,"location marker","color 32") @@ -118,8 +114,6 @@ COLOR_ALIAS(LockButtonFillActive,"lock button: fill","color 25") COLOR_ALIAS(LockButtonFill,"lock button: fill active","color 42") COLOR_ALIAS(LockButtonLEDActive,"lock button: led","color 4") COLOR_ALIAS(LockButtonLED,"lock button: led active","color 4") -COLOR_ALIAS(LockButtonTextActive,"lock button: text","color 43") -COLOR_ALIAS(LockButtonText,"lock button: text active","color 26") COLOR_ALIAS(MarkerBar,"marker bar","color 11") COLOR_ALIAS(MarkerBarSeparator,"marker bar separator","color 2") COLOR_ALIAS(MarkerDragLine,"marker drag line","color 44") @@ -167,8 +161,6 @@ COLOR_ALIAS(MidiInputButtonFillActive,"midi input button: fill","color 25") COLOR_ALIAS(MidiInputButtonFill,"midi input button: fill active","color 48") COLOR_ALIAS(MidiInputButtonLEDActive,"midi input button: led","color 4") COLOR_ALIAS(MidiInputButtonLED,"midi input button: led active","color 4") -COLOR_ALIAS(MidiInputButtonTextActive,"midi input button: text","color 4") -COLOR_ALIAS(MidiInputButtonText,"midi input button: text active","color 4") COLOR_ALIAS(MidiMeterColor0,"midi meter fill: 0","color 52") COLOR_ALIAS(MidiMeterColor1,"midi meter fill: 1","color 53") COLOR_ALIAS(MidiMeterColor2,"midi meter fill: 2","color 53") @@ -198,20 +190,14 @@ COLOR_ALIAS(MixerStripButtonFillActive,"mixer strip button: fill","color 25") COLOR_ALIAS(MixerStripButtonFill,"mixer strip button: fill active","color 8") COLOR_ALIAS(MixerStripButtonLEDActive,"mixer strip button: led","color 66") COLOR_ALIAS(MixerStripButtonLED,"mixer strip button: led active","color 8") -COLOR_ALIAS(MixerStripButtonTextActive,"mixer strip button: text","color 26") -COLOR_ALIAS(MixerStripButtonText,"mixer strip button: text active","color 4") COLOR_ALIAS(MixerStripNameButtonFillActive,"mixer strip name button: fill","color 25") COLOR_ALIAS(MixerStripNameButtonFill,"mixer strip name button: fill active","color 67") COLOR_ALIAS(MixerStripNameButtonLEDActive,"mixer strip name button: led","color 66") COLOR_ALIAS(MixerStripNameButtonLED,"mixer strip name button: led active","color 8") -COLOR_ALIAS(MixerStripNameButtonTextActive,"mixer strip name button: text","color 26") -COLOR_ALIAS(MixerStripNameButtonText,"mixer strip name button: text active","color 26") COLOR_ALIAS(MonitorButtonFillActive,"monitor button: fill","color 25") COLOR_ALIAS(MonitorButtonFill,"monitor button: fill active","color 68") COLOR_ALIAS(MonitorButtonLEDActive,"monitor button: led","color 69") COLOR_ALIAS(MonitorButtonLED,"monitor button: led active","color 9") -COLOR_ALIAS(MonitorButtonTextActive,"monitor button: text","color 26") -COLOR_ALIAS(MonitorButtonText,"monitor button: text active","color 27") COLOR_ALIAS(MonitorKnobArcEnd,"monitor knob","color 60") COLOR_ALIAS(MonitorKnobArcStart,"monitor knob: arc end","color 70") COLOR_ALIAS(MonitorSectionKnob,"monitor knob: arc start","color 16") @@ -273,22 +259,16 @@ COLOR_ALIAS(MouseModeButtonFillActive,"mouse mode button: fill","color 25") COLOR_ALIAS(MouseModeButtonFill,"mouse mode button: fill active","color 12") COLOR_ALIAS(MouseModeButtonLEDActive,"mouse mode button: led","color 66") COLOR_ALIAS(MouseModeButtonLED,"mouse mode button: led active","color 8") -COLOR_ALIAS(MouseModeButtonTextActive,"mouse mode button: text","color 26") -COLOR_ALIAS(MouseModeButtonText,"mouse mode button: text active","color 4") COLOR_ALIAS(MuteButtonFillActive,"mute button: fill","color 25") COLOR_ALIAS(MuteButtonFill,"mute button: fill active","color 75") COLOR_ALIAS(MuteButtonLEDActive,"mute button: led","color 4") COLOR_ALIAS(MuteButtonLED,"mute button: led active","color 4") -COLOR_ALIAS(MuteButtonTextActive,"mute button: text","color 26") -COLOR_ALIAS(MuteButtonText,"mute button: text active","color 27") COLOR_ALIAS(NameHighlightFill,"name highlight fill","color 18") COLOR_ALIAS(NameHighlightOutline,"name highlight outline","color 23") COLOR_ALIAS(NudgeButtonFillActive,"nudge button: fill","color 20") COLOR_ALIAS(NudgeButtonFill,"nudge button: fill active","color 42") COLOR_ALIAS(NudgeButtonLEDActive,"nudge button: led","color 66") COLOR_ALIAS(NudgeButtonLED,"nudge button: led active","color 8") -COLOR_ALIAS(NudgeButtonTextActive,"nudge button: text","color 26") -COLOR_ALIAS(NudgeButtonText,"nudge button: text active","color 26") COLOR_ALIAS(NudgeClockBackground,"nudge clock: background","color 7") COLOR_ALIAS(NudgeClockCursor,"nudge clock: cursor","color 8") COLOR_ALIAS(NudgeClockEditedText,"nudge clock: edited text","color 8") @@ -301,15 +281,11 @@ COLOR_ALIAS(PluginBypassButtonFillActive,"plugin bypass button: fill","color 71" COLOR_ALIAS(PluginBypassButtonFill,"plugin bypass button: fill active","color 42") COLOR_ALIAS(PluginBypassButtonLEDActive,"plugin bypass button: led","color 69") COLOR_ALIAS(PluginBypassButtonLED,"plugin bypass button: led active","color 9") -COLOR_ALIAS(PluginBypassButtonTextActive,"plugin bypass button: text","color 26") -COLOR_ALIAS(PluginBypassButtonText,"plugin bypass button: text active","color 26") COLOR_ALIAS(ProcessorAutomationLine,"processor automation line","color 77") COLOR_ALIAS(ProcessorControlButtonFillActive,"processor control button: fill","color 29") COLOR_ALIAS(ProcessorControlButtonFill,"processor control button: fill active","color 46") COLOR_ALIAS(ProcessorControlButtonLEDActive,"processor control button: led","color 67") COLOR_ALIAS(ProcessorControlButtonLED,"processor control button: led active","color 16") -COLOR_ALIAS(ProcessorControlButtonTextActive,"processor control button: text","color 13") -COLOR_ALIAS(ProcessorControlButtonText,"processor control button: text active","color 13") COLOR_ALIAS(ProcessorFaderFillActive,"processor fader: fill","color 16") COLOR_ALIAS(ProcessorFaderFill,"processor fader: fill active","color 78") COLOR_ALIAS(ProcessorFaderLEDActive,"processor fader: led","color 44") @@ -332,8 +308,6 @@ COLOR_ALIAS(PunchButtonFillActive,"punch button: fill","color 20") COLOR_ALIAS(PunchButtonFill,"punch button: fill active","color 9") COLOR_ALIAS(PunchButtonLEDActive,"punch button: led","color 4") COLOR_ALIAS(PunchButtonLED,"punch button: led active","color 4") -COLOR_ALIAS(PunchButtonTextActive,"punch button: text","color 81") -COLOR_ALIAS(PunchButtonText,"punch button: text active","color 82") COLOR_ALIAS(PunchClockBackground,"punch clock: background","color 4") COLOR_ALIAS(PunchClockCursor,"punch clock: cursor","color 9") COLOR_ALIAS(PunchClockEditedText,"punch clock: edited text","color 9") @@ -346,8 +320,6 @@ COLOR_ALIAS(RecWaveFormFill,"record enable button: fill","color 25") COLOR_ALIAS(RecWaveForm,"record enable button: fill active","color 83") COLOR_ALIAS(RecEnableButtonFillActive,"record enable button: led","color 84") COLOR_ALIAS(RecEnableButtonFill,"record enable button: led active","color 85") -COLOR_ALIAS(RecEnableButtonLEDActive,"record enable button: text","color 81") -COLOR_ALIAS(RecEnableButtonLED,"record enable button: text active","color 4") COLOR_ALIAS(RecEnableButtonTextActive,"recorded waveform fill","color 13") COLOR_ALIAS(RecEnableButtonText,"recorded waveform outline","color 43") COLOR_ALIAS(RecordingRect,"recording rect","color 86") @@ -357,8 +329,6 @@ COLOR_ALIAS(RouteButtonFillActive,"route button: fill","color 25") COLOR_ALIAS(RouteButtonFill,"route button: fill active","color 67") COLOR_ALIAS(RouteButtonLEDActive,"route button: led","color 66") COLOR_ALIAS(RouteButtonLED,"route button: led active","color 8") -COLOR_ALIAS(RouteButtonTextActive,"route button: text","color 26") -COLOR_ALIAS(RouteButtonText,"route button: text active","color 27") COLOR_ALIAS(RubberBandRect,"rubber band rect","color 88") COLOR_ALIAS(RudeAuditionFillActive,"rude audition: fill","color 20") COLOR_ALIAS(RudeAuditionFill,"rude audition: fill active","color 86") @@ -408,8 +378,6 @@ COLOR_ALIAS(SendButtonFillActive,"send alert button: fill","color 71") COLOR_ALIAS(SendButtonFill,"send alert button: fill active","color 96") COLOR_ALIAS(SendButtonLEDActive,"send alert button: led","color 4") COLOR_ALIAS(SendButtonLED,"send alert button: led active","color 4") -COLOR_ALIAS(SendButtonTextActive,"send alert button: text","color 97") -COLOR_ALIAS(SendButtonText,"send alert button: text active","color 4") COLOR_ALIAS(Shuttle,"shuttle","color 12") COLOR_ALIAS(Silence,"silence","color 98") COLOR_ALIAS(SilenceText,"silence text","color 99") @@ -417,8 +385,6 @@ COLOR_ALIAS(SoloButtonFillActive,"solo button: fill","color 25") COLOR_ALIAS(SoloButtonFill,"solo button: fill active","color 12") COLOR_ALIAS(SoloButtonLEDActive,"solo button: led","color 4") COLOR_ALIAS(SoloButtonLED,"solo button: led active","color 4") -COLOR_ALIAS(SoloButtonTextActive,"solo button: text","color 26") -COLOR_ALIAS(SoloButtonText,"solo button: text active","color 27") COLOR_ALIAS(SoloIsolateButtonFillActive,"solo isolate: fill","color 25") COLOR_ALIAS(SoloIsolateButtonFill,"solo isolate: fill active","color 42") COLOR_ALIAS(SoloIsolateButtonLEDActive,"solo isolate: led","color 69") @@ -459,14 +425,10 @@ COLOR_ALIAS(TransportActiveOptionButtonFillActive,"transport active option butto COLOR_ALIAS(TransportActiveOptionButtonFill,"transport active option button: fill active","color 48") COLOR_ALIAS(TransportActiveOptionButtonLEDActive,"transport active option button: led","color 66") COLOR_ALIAS(TransportActiveOptionButtonLED,"transport active option button: led active","color 8") -COLOR_ALIAS(TransportActiveOptionButtonTextActive,"transport active option button: text","color 26") -COLOR_ALIAS(TransportActiveOptionButtonText,"transport active option button: text active","color 4") COLOR_ALIAS(TransportButtonFillActive,"transport button: fill","color 25") COLOR_ALIAS(TransportButtonFill,"transport button: fill active","color 48") COLOR_ALIAS(TransportButtonLEDActive,"transport button: led","color 4") COLOR_ALIAS(TransportButtonLED,"transport button: led active","color 4") -COLOR_ALIAS(TransportButtonTextActive,"transport button: text","color 4") -COLOR_ALIAS(TransportButtonText,"transport button: text active","color 4") COLOR_ALIAS(TransportClockBackground,"transport clock: background","color 7") COLOR_ALIAS(TransportClockCursor,"transport clock: cursor","color 8") COLOR_ALIAS(TransportClockEditedText,"transport clock: edited text","color 8") @@ -482,15 +444,11 @@ COLOR_ALIAS(TransportOptionButtonFillActive,"transport option button: fill","col COLOR_ALIAS(TransportOptionButtonFill,"transport option button: fill active","color 42") COLOR_ALIAS(TransportOptionButtonLEDActive,"transport option button: led","color 66") COLOR_ALIAS(TransportOptionButtonLED,"transport option button: led active","color 8") -COLOR_ALIAS(TransportOptionButtonTextActive,"transport option button: text","color 26") -COLOR_ALIAS(TransportOptionButtonText,"transport option button: text active","color 26") COLOR_ALIAS(TransportPunchRect,"transport punch rect","color 80") COLOR_ALIAS(TransportRecenableButtonFillActive,"transport recenable button: fill","color 20") COLOR_ALIAS(TransportRecenableButtonFill,"transport recenable button: fill active","color 83") COLOR_ALIAS(TransportRecenableButtonLEDActive,"transport recenable button: led","color 4") COLOR_ALIAS(TransportRecenableButtonLED,"transport recenable button: led active","color 4") -COLOR_ALIAS(TransportRecenableButtonTextActive,"transport recenable button: text","color 4") -COLOR_ALIAS(TransportRecenableButtonText,"transport recenable button: text active","color 4") COLOR_ALIAS(TrimHandle,"trim handle","color 18") COLOR_ALIAS(TrimHandleLocked,"trim handle locked","color 86") COLOR_ALIAS(VerboseCanvasCursor,"verbose canvas cursor","color 32") @@ -503,11 +461,3 @@ COLOR_ALIAS(ZoomButtonFillActive,"zoom button: fill","color 25") COLOR_ALIAS(ZoomButtonFill,"zoom button: fill active","color 48") COLOR_ALIAS(ZoomButtonLEDActive,"zoom button: led","color 66") COLOR_ALIAS(ZoomButtonLED,"zoom button: led active","color 8") -COLOR_ALIAS(ZoomButtonTextActive,"zoom button: text","color 26") -COLOR_ALIAS(ZoomButtonText,"zoom button: text active","color 4") -COLOR_ALIAS(ZoomMenuFillActive,"zoom menu: fill","color 105") -COLOR_ALIAS(ZoomMenuFill,"zoom menu: fill active","color 42") -COLOR_ALIAS(ZoomMenuLEDActive,"zoom menu: led","color 66") -COLOR_ALIAS(ZoomMenuLED,"zoom menu: led active","color 8") -COLOR_ALIAS(ZoomMenuTextActive,"zoom menu: text","color 26") -COLOR_ALIAS(ZoomMenuText,"zoom menu: text active","color 26") -- cgit v1.2.3