Attempt to fix auto scroll on tree selection sync (still a bit buggy)

+ Added screenshots
nanawel · Aug 7, 2013 · af845e6 · af845e6
1 parent 3f02f17
commit af845e6
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/docs/Screenshot-JDuplicateFinder-1.png b/docs/Screenshot-JDuplicateFinder-1.png
diff --git a/docs/Screenshot-JDuplicateFinder-2.png b/docs/Screenshot-JDuplicateFinder-2.png
diff --git a/docs/Screenshot-JDuplicateFinder.png b/docs/Screenshot-JDuplicateFinder.png
diff --git a/src/nnwl/jduplicatefinder/ui/App.java b/src/nnwl/jduplicatefinder/ui/App.java
@@ -10,6 +10,7 @@
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.Insets;
+import java.awt.Rectangle;
 import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -961,9 +962,9 @@ private class ResultsTreeSelectionListener implements TreeSelectionListener
 	{
 		@Override
 		public void valueChanged(TreeSelectionEvent e) {
-			ResultsTree sourceTree = (ResultsTree) e.getSource();
-			ResultsTree otherTree = this.getOtherTree(sourceTree);
-			JScrollPane otherScrollPane = this.getOtherScrollpane(sourceTree);
+			final ResultsTree sourceTree = (ResultsTree) e.getSource();
+			final ResultsTree otherTree = this.getOtherTree(sourceTree);
+			//final JScrollPane otherScrollPane = this.getOtherScrollpane(sourceTree);
 
 			DefaultMutableTreeNode selectedNode = (DefaultMutableTreeNode) sourceTree.getLastSelectedPathComponent();
 			if (selectedNode == null) {
@@ -982,12 +983,16 @@ else if (selectedNode.getUserObject() instanceof SimilarityResult) {
 
 				DefaultMutableTreeNode similarFileNode = App.this.treeModel.getNodeFromPath(similarFile);
 
-				TreePath path = new TreePath(similarFileNode.getPath());
+				final TreePath path = new TreePath(similarFileNode.getPath());
 				otherTree.collapse();
 				otherTree.setSelectionPath(path);
 				otherTree.expandPath(path);
 
-				otherScrollPane.getViewport().scrollRectToVisible(otherTree.getPathBounds(path));
+				// Scroll to that node
+				// TODO Improve that
+				Rectangle bounds = otherTree.getPathBounds(path);
+				bounds.height = otherTree.getVisibleRect().height;
+				otherTree.scrollRectToVisible(bounds);
 			}
 			else {
 				App.this.fileInfoPanel.clear();
@@ -998,8 +1003,8 @@ private ResultsTree getOtherTree(ResultsTree t) {
 			return App.this.treeLeft == t ? App.this.treeRight : App.this.treeLeft;
 		}
 
-		private JScrollPane getOtherScrollpane(ResultsTree t) {
-			return App.this.treeLeft == t ? App.this.scrollPaneRight : App.this.scrollPaneLeft;
-		}
+//		private JScrollPane getOtherScrollpane(ResultsTree t) {
+//			return App.this.treeLeft == t ? App.this.scrollPaneRight : App.this.scrollPaneLeft;
+//		}
 	}
 }