projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prevent region drags with the middle button in internal edit mode (#3869).
[ardour.git]
/
gtk2_ardour
/
gain_meter.cc
diff --git
a/gtk2_ardour/gain_meter.cc
b/gtk2_ardour/gain_meter.cc
index 82b106c9a187e1533be3d0692f6ca2449397f082..8ef83cfad5b4e2e98446089992e17c1bcad4f3e4 100644
(file)
--- a/
gtk2_ardour/gain_meter.cc
+++ b/
gtk2_ardour/gain_meter.cc
@@
-449,7
+449,10
@@
GainMeterBase::set_meter_strip_name (const char * name)
void
GainMeterBase::set_fader_name (const char * name)
{
void
GainMeterBase::set_fader_name (const char * name)
{
- gain_slider->set_name (name);
+ uint32_t rgb_active = rgba_from_style (name, 0xff, 0, 0xff, 0, "bg", STATE_ACTIVE, false);
+ uint32_t rgb_normal = rgba_from_style (name, 0xff, 0xff, 0, 0, "bg", STATE_NORMAL, false);
+
+ gain_slider->set_border_colors (rgb_normal, rgb_active);
}
void
}
void
@@
-472,6
+475,10
@@
next_meter_point (MeterPoint mp)
break;
case MeterPostFader:
break;
case MeterPostFader:
+ return MeterOutput;
+ break;
+
+ case MeterOutput:
return MeterCustom;
break;
return MeterCustom;
break;
@@
-550,8
+557,8
@@
GainMeterBase::meter_press(GdkEventButton* ev)
gint
GainMeterBase::meter_release(GdkEventButton*)
{
gint
GainMeterBase::meter_release(GdkEventButton*)
{
- if
(!ignore_toggle)
{
- if (wait_for_release){
+ if
(!ignore_toggle)
{
+ if (wait_for_release)
{
wait_for_release = false;
if (_route) {
wait_for_release = false;
if (_route) {