summaryrefslogtreecommitdiff
path: root/gtk2_ardour/canvas-note-event.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2010-07-25 21:19:55 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2010-07-25 21:19:55 +0000
commit0bbc9144cca18495775cdc8b2050e5141bfcdc12 (patch)
tree8cdc26e873e77e609d493acccd32816296757d8d /gtk2_ardour/canvas-note-event.cc
parent6fa58df7918b3a9fea715bf6c917c144af540f3c (diff)
(1) extend region if needed BEFORE adding step-edit note, so that the new note ends up in the selection (2) hide the channel selector that shows up on note-right-click after its clicked anywhere, not just if the note(s) channel(s) are changed
git-svn-id: svn://localhost/ardour2/branches/3.0@7492 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/canvas-note-event.cc')
-rw-r--r--gtk2_ardour/canvas-note-event.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/gtk2_ardour/canvas-note-event.cc b/gtk2_ardour/canvas-note-event.cc
index f660f8e8ba..80275d9362 100644
--- a/gtk2_ardour/canvas-note-event.cc
+++ b/gtk2_ardour/canvas-note-event.cc
@@ -136,12 +136,14 @@ void
CanvasNoteEvent::show_channel_selector(void)
{
if (_channel_selector_widget == 0) {
- cerr << "Note has channel: " << int(_note->channel()) << endl;
SingleMidiChannelSelector* _channel_selector = new SingleMidiChannelSelector(_note->channel());
_channel_selector->show_all();
_channel_selector->channel_selected.connect(
sigc::mem_fun(this, &CanvasNoteEvent::on_channel_change));
+ _channel_selector->clicked.connect (
+ sigc::mem_fun (this, &CanvasNoteEvent::hide_channel_selector));
+
_channel_selector_widget = new Widget(*(_item->property_parent()),
x1(),
y2() + 2,
@@ -238,7 +240,6 @@ CanvasNoteEvent::on_event(GdkEvent* ev)
break;
case GDK_BUTTON_PRESS:
- cerr << "button press, bton = " << ev->button.button << endl;
if (ev->button.button == 3 && Keyboard::no_modifiers_active (ev->button.state)) {
show_channel_selector();
return true;