Fixed https://trello.com/c/wwJ2XyGN/ | Jumping in time also moves cursor on Keyframe Timeline

This commit is contained in:
CrushedPixel
2015-07-04 14:54:49 +02:00
parent 7115805d45
commit 22be6d193a
2 changed files with 5 additions and 3 deletions

View File

@@ -76,7 +76,9 @@ public class GuiKeyframeTimeline extends GuiTimeline {
this.dragging = false; this.dragging = false;
} }
} else { // If we didn't then just update the cursor } else { // If we didn't then just update the cursor
ReplayHandler.setRealTimelineCursor((int) time); if(this.placeKeyframes) { //only if it's the keyframe timeline
ReplayHandler.setRealTimelineCursor((int) time);
}
this.dragging = true; this.dragging = true;
} }
this.clickTime = currentTime; this.clickTime = currentTime;
@@ -116,7 +118,7 @@ public class GuiKeyframeTimeline extends GuiTimeline {
ReplayHandler.sortKeyframes(); ReplayHandler.sortKeyframes();
dragging = true; dragging = true;
} }
} else if (dragging) { } else if (dragging && placeKeyframes) {
ReplayHandler.setRealTimelineCursor((int) time); ReplayHandler.setRealTimelineCursor((int) time);
} }
} }

View File

@@ -276,8 +276,8 @@ public class GuiReplayOverlay extends Gui {
} }
zoom_scale = 0.1f; zoom_scale = 0.1f;
pos_left = 0; pos_left = 0;
ReplayHandler.setRealTimelineCursor(0);
if (slider) { if (slider) {
ReplayHandler.setRealTimelineCursor(0);
speedSlider.reset(); speedSlider.reset();
} }
} }