From 5912d6bbeaddcc95e4ee05dd3e2e061271b28f85 Mon Sep 17 00:00:00 2001 From: dev747368 <48332326+dev747368@users.noreply.github.com> Date: Mon, 18 Oct 2021 13:02:15 -0400 Subject: [PATCH] GP-1410 fix scroll bars in userlist of shared project --- .../main/java/ghidra/framework/main/ProjectAccessPanel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/ProjectAccessPanel.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/ProjectAccessPanel.java index d26ecf2a8c..23eca5bb98 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/ProjectAccessPanel.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/ProjectAccessPanel.java @@ -482,6 +482,7 @@ public class ProjectAccessPanel extends AbstractWizardJPanel { * Panel for displaying the list of users with repository access. */ class KnownUsersPanel extends JPanel { + private static final int DEFAULT_USERLIST_ROWS_TO_SHOW = 20; private JList userList; private DefaultListModel listModel; @@ -514,6 +515,8 @@ public class ProjectAccessPanel extends AbstractWizardJPanel { // Set the minimum dimensions of the scroll pane so we can't collapse it. Dimension d = userList.getPreferredSize(); d.width = 100; + d.height = + Math.min(userList.getFixedCellHeight() * DEFAULT_USERLIST_ROWS_TO_SHOW, d.height); sp.setPreferredSize(d); sp.setMinimumSize(new Dimension(100, 200));