X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpiano_roll_header.cc;h=8a67ec75016c0e145359ee97b3e05960eeef4e52;hb=20ea90a186748f34061fec323faa74f084c7937c;hp=e784242ff1247319ab2bf0e56f641d466b262ccb;hpb=2b9421fd391efcddde0be3397cb66e19b744a155;p=ardour.git

diff --git a/gtk2_ardour/piano_roll_header.cc b/gtk2_ardour/piano_roll_header.cc
index e784242ff1..8a67ec7501 100644
--- a/gtk2_ardour/piano_roll_header.cc
+++ b/gtk2_ardour/piano_roll_header.cc
@@ -174,16 +174,16 @@ render_dga(Cairo::RefPtr<Cairo::Context> cr, int /*note*/, double x[], double y[
 void
 PianoRollHeader::get_path(PianoRollHeader::ItemType note_type, int note, double x[], double y[])
 {
-	double y_pos = floor(_view.note_to_y(note)) - 0.5f;
+	double y_pos = floor(_view.note_to_y(note)) + 1.5f;
 	double note_height;
-	double other_y1 = floor(_view.note_to_y(note+1)) + floor(_note_height / 2.0f) + 0.5f;
-	double other_y2 = floor(_view.note_to_y(note-1)) + floor(_note_height / 2.0f) - 1.0f;
+	double other_y1 = floor(_view.note_to_y(note+1)) + floor(_note_height / 2.0f) + 2.5f;
+	double other_y2 = floor(_view.note_to_y(note-1)) + floor(_note_height / 2.0f) + 1.0f;
 	double width = get_width();
 
 	if (note == 0) {
-		note_height = floor(_view.contents_height()) - y_pos;
+		note_height = floor(_view.contents_height()) - y_pos + 2.;
 	} else {
-		note_height = floor(_view.note_to_y(note - 1)) - y_pos;
+		note_height = floor(_view.note_to_y(note - 1)) - y_pos + 2.;
 	}
 
 	switch (note_type) {
@@ -513,17 +513,15 @@ bool
 PianoRollHeader::on_button_press_event (GdkEventButton* ev)
 {
 	int note = _view.y_to_note(ev->y);
-
-	if (ev->button == 2 && ev->type == GDK_BUTTON_PRESS) {
-		if (Keyboard::no_modifiers_active (ev->state)) {
-			SetNoteSelection (note); // EMIT SIGNAL
-			return true;
-		}
-		return false;
-	}
-	
-	if (ev->button == 1 && ev->type == GDK_BUTTON_PRESS && note >= 0 && note < 128) {
-		
+	bool tertiary = Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier);
+
+	if (ev->button == 2 && Keyboard::no_modifiers_active (ev->state)) {
+		SetNoteSelection (note); // EMIT SIGNAL
+		return true;
+	} else if (tertiary && (ev->button == 1 || ev->button == 2)) {
+		ExtendNoteSelection (note); // EMIT SIGNAL
+		return true;
+	} else if (ev->button == 1 && note >= 0 && note < 128) {
 		add_modal_grab();
 		_dragging = true;