ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

fader coloring: ignore master, and rename UIConfig option to be more generic now (also text in prefs)

Browse Source
This commit is contained in:
Paul Davis 2022-08-11 08:22:49 -06:00
parent 04ad500998
commit 870a51b691
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk2_ardour/mixer_strip.cc
View File

@ -1426,7 +1426,7 @@ MixerStrip::reset_strip_style ()
} else {
set_name ("MidiTrackStripBaseInactive");
}
if (UIConfiguration::instance().get_use_route_color_for_bg()) {
if (UIConfiguration::instance().get_use_route_color_widely()) {
// gpm.set_fader_bg ();
gpm.set_fader_fg (gdk_color_to_rgba (route_color_tint()));
} else {
@ -1439,7 +1439,7 @@ MixerStrip::reset_strip_style ()
} else {
set_name ("AudioTrackStripBaseInactive");
}
if (UIConfiguration::instance().get_use_route_color_for_bg()) {
if (!is_master() && UIConfiguration::instance().get_use_route_color_widely()) {
// gpm.set_fader_bg ();
gpm.set_fader_fg (gdk_color_to_rgba (route_color_tint()));
} else {
@ -1453,7 +1453,7 @@ MixerStrip::reset_strip_style ()
set_name ("AudioBusStripBaseInactive");
}
if (UIConfiguration::instance().get_use_route_color_for_bg()) {
if (UIConfiguration::instance().get_use_route_color_widely()) {
// gpm.set_fader_bg ();
gpm.set_fader_fg (gdk_color_to_rgba (route_color_tint()));
} else {

8
gtk2_ardour/rc_option_editor.cc
View File

@ -2522,10 +2522,10 @@ RCOptionEditor::RCOptionEditor ()
add_option (_("Appearance"), new OptionEditorHeading (_("Theme")));
add_option (_("Appearance"), new BoolOption (
"use-route-color-for-bg",
_("Use track/bus colors in backgrounds"),
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_use_route_color_for_bg),
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_use_route_color_for_bg)
"use-route-color-widely",
_("Color faders with track/bus colors"),
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_use_route_color_widely),
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_use_route_color_widely)
));
add_option (_("Appearance"), new BoolOption (

2
gtk2_ardour/route_time_axis.cc
View File

@ -1037,7 +1037,7 @@ RouteTimeAxisView::route_color_changed ()
}
number_label.set_fixed_colors (gdk_color_to_rgba (color()), gdk_color_to_rgba (color()));
if (UIConfiguration::instance().get_use_route_color_for_bg()) {
if (UIConfiguration::instance().get_use_route_color_widely()) {
gm.set_fader_fg (gdk_color_to_rgba (route_color_tint ()));
} else {
gm.unset_fader_fg ();

2
gtk2_ardour/ui_config_vars.h
View File

@ -33,7 +33,7 @@ UI_CONFIG_VARIABLE (bool, all_floating_windows_are_dialogs, "all-floating-window
UI_CONFIG_VARIABLE (bool, floating_monitor_section, "floating-monitor-section", false)
UI_CONFIG_VARIABLE (bool, transients_follow_front, "transients-follow-front", false)
UI_CONFIG_VARIABLE (bool, color_regions_using_track_color, "color-regions-using-track-color", false)
UI_CONFIG_VARIABLE (bool, use_route_color_for_bg, "use-route-color-for-bg", false)
UI_CONFIG_VARIABLE (bool, use_route_color_widely, "use-route-color-widely", false)
UI_CONFIG_VARIABLE (uint32_t, vertical_region_gap, "vertical-region-gap", 0)
UI_CONFIG_VARIABLE (bool, editor_stereo_only_meters, "editor-stereo-only-meters", true)
UI_CONFIG_VARIABLE (bool, show_waveform_clipping, "show-waveform-clipping", true)