Merge branch 'ardour'
This commit is contained in:
commit
5b1acd3b36
4652
gtk2_ardour/po/ru.po
4652
gtk2_ardour/po/ru.po
File diff suppressed because it is too large
Load Diff
@ -411,20 +411,26 @@ TimeAxisView::controls_ebox_scroll (GdkEventScroll* ev)
|
|||||||
bool
|
bool
|
||||||
TimeAxisView::controls_ebox_button_press (GdkEventButton* event)
|
TimeAxisView::controls_ebox_button_press (GdkEventButton* event)
|
||||||
{
|
{
|
||||||
if ((event->button == 1 && event->type == GDK_2BUTTON_PRESS) || Keyboard::is_edit_event (event)) {
|
if (event->button == 1) {
|
||||||
/* see if it is inside the name label */
|
/* see if it is inside the name label */
|
||||||
if (name_label.is_ancestor (controls_ebox)) {
|
if (name_label.is_ancestor (controls_ebox)) {
|
||||||
|
|
||||||
int nlx;
|
int nlx;
|
||||||
int nly;
|
int nly;
|
||||||
controls_ebox.translate_coordinates (name_label, event->x, event->y, nlx, nly);
|
controls_ebox.translate_coordinates (name_label, event->x, event->y, nlx, nly);
|
||||||
Gtk::Allocation a = name_label.get_allocation ();
|
Gtk::Allocation a = name_label.get_allocation ();
|
||||||
|
|
||||||
if (nlx > 0 && nlx < a.get_width() && nly > 0 && nly < a.get_height()) {
|
if (nlx > 0 && nlx < a.get_width() && nly > 0 && nly < a.get_height()) {
|
||||||
begin_name_edit ();
|
|
||||||
_ebox_release_can_act = false;
|
if ((event->type == GDK_2BUTTON_PRESS) || Keyboard::is_edit_event (event)) {
|
||||||
return true;
|
begin_name_edit ();
|
||||||
|
_ebox_release_can_act = false;
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (event->button == 1 && event->type == GDK_2BUTTON_PRESS) {
|
if (event->button == 1 && event->type == GDK_2BUTTON_PRESS) {
|
||||||
|
Loading…
Reference in New Issue
Block a user