From d65c34b97d32d296b8353f13a94f5ffba8629fe3 Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Fri, 18 Dec 2020 10:53:26 -0500 Subject: [PATCH] 7084 rough changes to try and make scroll bar work --- .../artifactviewers/GeneralPurposeArtifactViewer.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/GeneralPurposeArtifactViewer.java b/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/GeneralPurposeArtifactViewer.java index 9b73f989a8..e2fe24403f 100644 --- a/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/GeneralPurposeArtifactViewer.java +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/GeneralPurposeArtifactViewer.java @@ -377,6 +377,9 @@ public class GeneralPurposeArtifactViewer extends AbstractArtifactDetailsPanel i gridBagConstraints.gridy++; detailsPanel.add(new javax.swing.JLabel(" "), gridBagConstraints); addLineEndGlue(); + headingLabel.setFocusable(false); + } else { + headingLabel.requestFocusInWindow(); } gridBagConstraints.gridy++; gridBagConstraints.gridx = LABEL_COLUMN;; @@ -434,6 +437,8 @@ public class GeneralPurposeArtifactViewer extends AbstractArtifactDetailsPanel i gridBagConstraints.fill = GridBagConstraints.VERTICAL; javax.swing.Box.Filler vertFiller = new javax.swing.Box.Filler(new Dimension(0, 0), new Dimension(0, 0), new Dimension(0, 32767)); detailsPanel.add(vertFiller, gridBagConstraints); + detailsPanel.revalidate(); + detailsScrollPane.revalidate(); detailsScrollPane.getVerticalScrollBar().setValue(0); detailsScrollPane.getHorizontalScrollBar().setValue(0); } @@ -448,6 +453,7 @@ public class GeneralPurposeArtifactViewer extends AbstractArtifactDetailsPanel i private JLabel addKeyAtCol(String keyString) { // create label javax.swing.JLabel keyLabel = new javax.swing.JLabel(); + keyLabel.setFocusable(false); gridBagConstraints.gridy++; gridBagConstraints.gridx = LABEL_COLUMN; gridBagConstraints.gridwidth = LABEL_WIDTH; @@ -468,6 +474,7 @@ public class GeneralPurposeArtifactViewer extends AbstractArtifactDetailsPanel i private JTextPane addValueAtCol(String valueString) { // create label, JTextPane valueField = new JTextPane(); + valueField.setFocusable(false); valueField.setEditable(false); valueField.setOpaque(false); gridBagConstraints.gridx = VALUE_COLUMN;