Add correct sizing/spacing of staves and braces for ledger lines.

[scherzo] / scherzo.c

diff --git a/scherzo.c b/scherzo.c
index 88cae44fe4cdb85bde4669a41e713f463767915c..98f70bd99ff2485e0cf3e0b4ad542341353f41f5 100644 (file)
--- a/scherzo.c
+++ b/scherzo.c
@@ -92,7 +92,7 @@ on_expose_event_draw (GtkWidget *widget,
     cairo_paint (cr);
 
     /* Add some padding on the sides and top */
-    cairo_translate (cr, pad, 2 * scherzo->staff_height);
+    cairo_translate (cr, pad, scherzo->staff_height);
     score_set_staff_height (score, scherzo->staff_height);
     score_set_width (score, widget_width - 2 * pad);
 
@@ -358,6 +358,7 @@ on_midi_input (unused (GIOChannel *channel),
     ssize_t remaining;
     snd_seq_event_t event;
     score_note_t *note;
+    int need_redraw = FALSE;
 
     remaining = read (scherzo->midi_fd, buf, MIDI_BUF_SIZE);
 
@@ -378,12 +379,12 @@ on_midi_input (unused (GIOChannel *channel),
        case SND_SEQ_EVENT_NOTEON:
            note = scherzo_add_note_midi (scherzo, event.data.note.note);
            _judge_note (scherzo, note);
-           gtk_widget_queue_draw (scherzo->window);
+           need_redraw = TRUE;
            break;
        case SND_SEQ_EVENT_NOTEOFF:
            scherzo_remove_note_midi (scherzo, event.data.note.note);
            _score_challenge (scherzo);
-           gtk_widget_queue_draw (scherzo->window);
+           need_redraw = TRUE;
            break;
        case SND_SEQ_EVENT_CLOCK:
            /* Ignore for now as my piano sends a constant stream of these. */
@@ -397,7 +398,10 @@ on_midi_input (unused (GIOChannel *channel),
            break;
        }
     }
-    
+
+    if (need_redraw)
+       gtk_widget_queue_draw (scherzo->window);
+
     /* Return TRUE to continue to get called in the future. */
     return TRUE;
 }