Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2015-03-03 16:46:04 +0000
committerEike Stepper2015-03-03 16:46:04 +0000
commit12336f989b3dc5e49ecd522876e2f1c11cb1f2eb (patch)
tree1e73be877f964c6a029939552e734eab5fb21f16 /plugins/org.eclipse.emf.cdo.ui
parentac3895197715750ec764d89033ed485ab9dc5c89 (diff)
downloadcdo-12336f989b3dc5e49ecd522876e2f1c11cb1f2eb.tar.gz
cdo-12336f989b3dc5e49ecd522876e2f1c11cb1f2eb.tar.xz
cdo-12336f989b3dc5e49ecd522876e2f1c11cb1f2eb.zip
[458349] Consolidate UI
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=458349
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.ui')
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/TimeSlider.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/TimeSlider.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/TimeSlider.java
index eae38c27af..203b2fc926 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/TimeSlider.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/TimeSlider.java
@@ -128,6 +128,12 @@ public class TimeSlider extends Scale implements IListener, ITreeViewerListener
if (this.timeStamp != timeStamp)
{
this.timeStamp = timeStamp;
+ int newSelection = (int)((timeStamp - startTimeStamp) / stepSize);
+ if (getSelection() != newSelection)
+ {
+ setSelection(newSelection);
+ }
+
timeStampChanged(timeStamp);
}
}
@@ -164,7 +170,7 @@ public class TimeSlider extends Scale implements IListener, ITreeViewerListener
absoluteTimeWindowLength = endTimeStamp - startTimeStamp;
stepSize = absoluteTimeWindowLength / FACTOR;
- setTimeStamp(endTimeStamp);
+ setTimeStamp(view.getTimeStamp());
staleReferencePolicy = new CDOStaleReferencePolicy.DynamicProxy.Enhanced(view);
view.addListener(this);

Back to the top