smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-16 19:56:31 +01:00
Code Issues Projects Releases Wiki Activity

fix plugin bypass button action

Browse source
This commit is contained in:
Ben Loftis 2014-08-28 14:55:39 -05:00
parent e6ab754e4f
commit b0477f7f1e
2 changed files with 9 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/plugin_ui.cc
View file

@ -448,7 +448,7 @@ PlugUIBase::PlugUIBase (boost::shared_ptr<PluginInsert> pi)
bypass_button.set_name ("plugin bypass button"); bypass_button.set_name ("plugin bypass button");
bypass_button.set_text (_("Bypass")); bypass_button.set_text (_("Bypass"));
bypass_button.set_active (!pi->active()); bypass_button.set_active (!pi->active());
bypass_button.signal_button_release_event().connect (sigc::mem_fun(*this, &PlugUIBase::bypass_button_release)); bypass_button.signal_button_release_event().connect (sigc::mem_fun(*this, &PlugUIBase::bypass_button_release), false);
focus_button.add_events (Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK); focus_button.add_events (Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK);
focus_button.signal_button_release_event().connect (sigc::mem_fun(*this, &PlugUIBase::focus_toggled)); focus_button.signal_button_release_event().connect (sigc::mem_fun(*this, &PlugUIBase::focus_toggled));

28
libs/gtkmm2ext/barcontroller.cc
View file

@ -450,29 +450,17 @@ BarController::expose (GdkEventExpose* /*event*/)
double xpos = -1; double xpos = -1;
std::string const label = get_label (xpos); std::string const label = get_label (xpos);
if (!label.empty()) {
/* if (!label.empty()) {
int twidth, theight;
layout->set_text (label); layout->set_text (label);
layout->get_pixel_size (twidth, theight);
int width, height, x;
layout->get_pixel_size (width, height);
if (xpos == -1) { c = get_style()->get_text (get_state());
x = max (3, 1 + (x2 - (width/2))); CairoWidget::set_source_rgb_a (cr, c, 1.0);
x = min (darea.get_width() - width - 3, (int) lrint (xpos)); context->move_to ( (fract > 0.5) ? w - twidth/0.7 : twidth/0.7, (darea.get_height()/2) - (theight/2));
} else { layout->show_in_cairo_context (context);
x = lrint (darea.get_width() * xpos); }
}
c = get_style()->get_text (get_state());
r = c.get_red_p ();
g = c.get_green_p ();
b = c.get_blue_p ();
context->set_source_rgb (r, g, b);
context->move_to (x, (darea.get_height()/2) - (height/2));
layout->show_in_cairo_context (context);
}*/
return true; return true;
} }