diff options
| author | Gonzalo Odiard <godiard@gmail.com> | 2013-01-15 13:09:27 (GMT) |
|---|---|---|
| committer | Gonzalo Odiard <godiard@gmail.com> | 2013-01-18 19:59:59 (GMT) |
| commit | 814bfea231075043a97b778e09b2ffb510b4f768 (patch) | |
| tree | e9ef0faac662425c9937920266233c189df603b3 /Edit/TrackInterface.py | |
| parent | e256881651711fb39323bdf8cde091ed926187fa (diff) | |
Now editing notes works properly
Signed-off-by: Aaron Gordon <aaronsgordon@yahoo.com>
Diffstat (limited to 'Edit/TrackInterface.py')
| -rw-r--r-- | Edit/TrackInterface.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Edit/TrackInterface.py b/Edit/TrackInterface.py index ea50dab..26f779b 100644 --- a/Edit/TrackInterface.py +++ b/Edit/TrackInterface.py @@ -644,12 +644,12 @@ class TrackInterface( Gtk.EventBox ): TP.ProfileEnd( "TI::handleMotion::Common" ) - if not self.clickButton and self.curAction != "paste": # we recieved this event but were never clicked! (probably a popup window was open) TP.ProfileBegin( "TI::handleMotion::Hover" ) self.updateTooltip( event ) TP.ProfileEnd( "TI::handleMotion::Hover" ) return + if self.curAction == "paste": TP.ProfileBegin( "TI::handleMotion::Paste" ) top = Config.NUMBER_OF_TRACKS @@ -661,7 +661,7 @@ class TrackInterface( Gtk.EventBox ): self.updatePaste( self.pixelsToTicksFloor( self.curBeats, event.x ), top ) TP.ProfileEnd( "TI::handleMotion::Paste" ) - elif event.state & Gdk.EventMask.BUTTON1_MOTION_MASK: + elif event.state & Gdk.ModifierType.BUTTON1_MASK: TP.ProfileBegin( "TI::handleMotion::Drag" ) if not self.curAction: # no action is in progress yet we're dragging, start a marquee @@ -671,9 +671,11 @@ class TrackInterface( Gtk.EventBox ): self.noteDragOnset( event ) elif self.curAction == "note-drag-duration": + print "note drag duration" self.noteDragDuration( event ) elif self.curAction == "note-drag-pitch": + print "note drag pitch" self.noteDragPitch( event ) elif self.curAction == "note-drag-pitch-drum": @@ -906,8 +908,8 @@ class TrackInterface( Gtk.EventBox ): self.curActionObject.playSampleNote( False ) def doneNoteDrag( self, action ): - # if action == "note-drag-pitch" or action == "note-drag-pitch-drum": - # self.curActionObject.playSampleNote() + if action == "note-drag-pitch" or action == "note-drag-pitch-drum": + self.curActionObject.playSampleNote() self.lastDO = self.lastDP = self.lastDrumDP = self.lastDD = None |