From d397b8b946b5bfb8429841b4011da0c39fa097f7 Mon Sep 17 00:00:00 2001 From: Nat Date: Tue, 18 Sep 2007 20:32:36 +0000 Subject: Merge branch 'master' of git+ssh://natcl@dev.laptop.org/git/projects/tamtam --- diff --git a/TamTamEdit.activity/Edit/TrackInterface.py b/TamTamEdit.activity/Edit/TrackInterface.py index 5b63576..34883c0 100644 --- a/TamTamEdit.activity/Edit/TrackInterface.py +++ b/TamTamEdit.activity/Edit/TrackInterface.py @@ -392,6 +392,10 @@ class TrackInterface( gtk.EventBox ): TP.ProfileEnd( "TI::handleButtonPress" ) return + if event.x < Config.TRACK_SPACING_DIV2 or event.x > self.trackWidth + Config.TRACK_SPACING_DIV2: + TP.ProfileEnd( "TI::handleButtonPress" ) + return + for i in range(Config.NUMBER_OF_TRACKS): if self.trackLimits[i][0] > event.y: break if self.trackLimits[i][1] < event.y: continue @@ -1130,6 +1134,10 @@ class TrackInterface( gtk.EventBox ): self.setCursor("drag-playhead") return + if event.x < Config.TRACK_SPACING_DIV2 or event.x > self.trackWidth + Config.TRACK_SPACING_DIV2: + self.setCursor("default") + return + for i in range(Config.NUMBER_OF_TRACKS): if self.trackLimits[i][0] > event.y: break if self.trackLimits[i][1] < event.y: continue diff --git a/scripts/create_symlinks.sh b/scripts/create_symlinks.sh index cb3d6ee..c25ae95 100644..100755 --- a/scripts/create_symlinks.sh +++ b/scripts/create_symlinks.sh @@ -5,4 +5,4 @@ rm -rf /usr/share/activities/TamTamSynthlab.activity ln -s /home/olpc/tamtam/TamTamEdit.activity /usr/share/activities/TamTamEdit.activity ln -s /home/olpc/tamtam/TamTamJam.activity /usr/share/activities/TamTamJam.activity -ln -s /home/olpc/tamtam/TamTamSynthlab.activity /usr/share/activities/TamTamSynthlab.activity +ln -s /home/olpc/tamtam/TamTamSynthLab.activity /usr/share/activities/TamTamSynthLab.activity -- cgit v0.9.1