From 22be6d193a239efd79db8851180e62afc14c5060 Mon Sep 17 00:00:00 2001 From: CrushedPixel Date: Sat, 4 Jul 2015 14:54:49 +0200 Subject: [PATCH] Fixed https://trello.com/c/wwJ2XyGN/ | Jumping in time also moves cursor on Keyframe Timeline --- .../replaymod/gui/elements/GuiKeyframeTimeline.java | 6 ++++-- .../replaymod/gui/overlay/GuiReplayOverlay.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiKeyframeTimeline.java b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiKeyframeTimeline.java index 33b97bf1..0effff33 100644 --- a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiKeyframeTimeline.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiKeyframeTimeline.java @@ -76,7 +76,9 @@ public class GuiKeyframeTimeline extends GuiTimeline { this.dragging = false; } } 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.clickTime = currentTime; @@ -116,7 +118,7 @@ public class GuiKeyframeTimeline extends GuiTimeline { ReplayHandler.sortKeyframes(); dragging = true; } - } else if (dragging) { + } else if (dragging && placeKeyframes) { ReplayHandler.setRealTimelineCursor((int) time); } } diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/overlay/GuiReplayOverlay.java b/src/main/java/eu/crushedpixel/replaymod/gui/overlay/GuiReplayOverlay.java index d19dddaa..d6f99c1d 100755 --- a/src/main/java/eu/crushedpixel/replaymod/gui/overlay/GuiReplayOverlay.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/overlay/GuiReplayOverlay.java @@ -276,8 +276,8 @@ public class GuiReplayOverlay extends Gui { } zoom_scale = 0.1f; pos_left = 0; - ReplayHandler.setRealTimelineCursor(0); if (slider) { + ReplayHandler.setRealTimelineCursor(0); speedSlider.reset(); } }