X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=MooTrackView.java;h=dd348fd98e18080327fbf74cfabd20afb0d232cf;hb=cbc9ee43669a7e7308f6ab7b2023dc99a96764da;hp=12c6babb179d37c2def5d38f40637665b305b9b4;hpb=090ed9e7cda839261543f2992c67f1c94f3e6935;p=moosique.git diff --git a/MooTrackView.java b/MooTrackView.java index 12c6bab..dd348fd 100644 --- a/MooTrackView.java +++ b/MooTrackView.java @@ -64,6 +64,7 @@ public class MooTrackView extends JPanel implements ActionListener { public static final int NOTE_SIZE = 20; public NoteArea(Track track) { + setLayout(null); MidiEvent note; MooNoteElement elem; boolean isOccupied; @@ -72,14 +73,17 @@ public class MooTrackView extends JPanel implements ActionListener { for (int i = 0; i < track.size(); i++) { note = track.get(i); if (note instanceof MooNote) { + // Adds the note element to the note area. MooNote mn = (MooNote)note; elem = new MooNoteElement(mn); add(elem); + + // Places the note element in the appropriate place. x = insets.left; y = insets.top + (int)(mn.getTick() / 24) * NOTE_SIZE; height = (mn.getDuration() / 24) * NOTE_SIZE; - while(findComponentAt(x, y) != this || findComponentAt(x, y + height - 1) != this) x += NOTE_SIZE; - elem.setBounds(x, y, NOTE_SIZE, height); + //System.out.println(findComponentAt(x, y) != this); + elem.setBounds(x, y, NOTE_SIZE, 20); } } }