mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-09 16:24:57 +01:00
Fix VCA button event propagation
This prevents double-click on the VCA spill button from to showing the add route dialog.
This commit is contained in:
parent
9e0c1ff510
commit
c11f62fd51
2 changed files with 4 additions and 3 deletions
|
|
@ -109,7 +109,8 @@ VCAMasterStrip::VCAMasterStrip (Session* s, std::shared_ptr<VCA> v)
|
||||||
/* horizontally centered, with a little space (5%) at the top */
|
/* horizontally centered, with a little space (5%) at the top */
|
||||||
vertical_button.set_angle (90);
|
vertical_button.set_angle (90);
|
||||||
vertical_button.set_layout_font (UIConfiguration::instance().get_NormalBoldFont());
|
vertical_button.set_layout_font (UIConfiguration::instance().get_NormalBoldFont());
|
||||||
vertical_button.signal_button_release_event().connect (sigc::mem_fun (*this, &VCAMasterStrip::vertical_button_press));
|
vertical_button.signal_button_press_event().connect ([](GdkEventButton*) { return false;}, false);
|
||||||
|
vertical_button.signal_button_release_event().connect (sigc::mem_fun (*this, &VCAMasterStrip::vertical_button_release), false);
|
||||||
vertical_button.set_fallthrough_to_parent (true);
|
vertical_button.set_fallthrough_to_parent (true);
|
||||||
vertical_button.set_active_color (_vca->presentation_info().color ());
|
vertical_button.set_active_color (_vca->presentation_info().color ());
|
||||||
set_tooltip (vertical_button, _("Click to show assigned channels only")); /* tooltip updated dynamically */
|
set_tooltip (vertical_button, _("Click to show assigned channels only")); /* tooltip updated dynamically */
|
||||||
|
|
@ -380,7 +381,7 @@ VCAMasterStrip::solo_changed ()
|
||||||
}
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
VCAMasterStrip::vertical_button_press (GdkEventButton* ev)
|
VCAMasterStrip::vertical_button_release (GdkEventButton* ev)
|
||||||
{
|
{
|
||||||
if (ev->button == 1 && ev->type == GDK_2BUTTON_PRESS) {
|
if (ev->button == 1 && ev->type == GDK_2BUTTON_PRESS) {
|
||||||
start_name_edit ();
|
start_name_edit ();
|
||||||
|
|
|
||||||
|
|
@ -95,7 +95,7 @@ private:
|
||||||
void unassign ();
|
void unassign ();
|
||||||
void start_name_edit ();
|
void start_name_edit ();
|
||||||
void finish_name_edit (std::string, int);
|
void finish_name_edit (std::string, int);
|
||||||
bool vertical_button_press (GdkEventButton*);
|
bool vertical_button_release (GdkEventButton*);
|
||||||
bool number_button_press (GdkEventButton*);
|
bool number_button_press (GdkEventButton*);
|
||||||
void vca_property_changed (PBD::PropertyChange const & what_changed);
|
void vca_property_changed (PBD::PropertyChange const & what_changed);
|
||||||
void update_vca_name ();
|
void update_vca_name ();
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue