From 880391a088939a8a3515bd28c130a82b683f0527 Mon Sep 17 00:00:00 2001 From: Fiona Reid Date: Thu, 24 Jan 2019 15:59:49 +0000 Subject: [PATCH 1/2] Added scrollbars to icons but would like them to be on left side ideally --- .../presentation/workbench/WorkbenchImpl.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pickcells-container/src/main/java/org/pickcellslab/pickcells/impl/presentation/workbench/WorkbenchImpl.java b/pickcells-container/src/main/java/org/pickcellslab/pickcells/impl/presentation/workbench/WorkbenchImpl.java index 842f496..cffab46 100644 --- a/pickcells-container/src/main/java/org/pickcellslab/pickcells/impl/presentation/workbench/WorkbenchImpl.java +++ b/pickcells-container/src/main/java/org/pickcellslab/pickcells/impl/presentation/workbench/WorkbenchImpl.java @@ -58,6 +58,12 @@ import javax.swing.JOptionPane; import javax.swing.JToolBar; import javax.swing.ListSelectionModel; +//Added by FR +//import javax.swing.JFrame; +import javax.swing.JScrollPane; +//import java.awt.Container; +//end of block added by FR + import org.pickcellslab.foundationj.annotations.CoreImpl; import org.pickcellslab.foundationj.annotations.ScopeOption; import org.pickcellslab.foundationj.dbm.access.DataAccess; @@ -166,8 +172,11 @@ public class WorkbenchImpl implements Workbench{ .filter(we->Task.class.isAssignableFrom(we.getClass())) .map(we->(Task)we) .collect(Collectors.toList())); - documentsContainer.add(tasksBar, BorderLayout.WEST); - +// documentsContainer.add(tasksBar, BorderLayout.WEST); + JScrollPane spVert = new JScrollPane(tasksBar, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, + JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); + documentsContainer.add(spVert, BorderLayout.WEST); + final WebDocumentPane> web = buildDefaultView(access, elements.stream() .filter(we->DefaultDocument.class.isAssignableFrom(we.getClass())) .map(we->(DefaultDocument)we) @@ -179,8 +188,10 @@ public class WorkbenchImpl implements Workbench{ .map(we->(DBViewFactory)we) .collect(Collectors.toList()), web); - documentsContainer.add(viewsBar, BorderLayout.NORTH); - +// documentsContainer.add(viewsBar, BorderLayout.NORTH); + JScrollPane spHorz = new JScrollPane(viewsBar, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, + JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS); + documentsContainer.add(spHorz, BorderLayout.NORTH); // Add documentContainer to mainContainer -- GitLab From fe0f51d84b671445924022674acd98e19165b1a1 Mon Sep 17 00:00:00 2001 From: Fiona Reid Date: Tue, 29 Jan 2019 14:34:29 +0000 Subject: [PATCH 2/2] Added scroll bars, vertical always on and horizontal only if screen gets really small, both the scroll bar and mouse scroll wheel can be used --- .../presentation/workbench/WorkbenchImpl.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pickcells-container/src/main/java/org/pickcellslab/pickcells/impl/presentation/workbench/WorkbenchImpl.java b/pickcells-container/src/main/java/org/pickcellslab/pickcells/impl/presentation/workbench/WorkbenchImpl.java index cffab46..6b92b8a 100644 --- a/pickcells-container/src/main/java/org/pickcellslab/pickcells/impl/presentation/workbench/WorkbenchImpl.java +++ b/pickcells-container/src/main/java/org/pickcellslab/pickcells/impl/presentation/workbench/WorkbenchImpl.java @@ -55,15 +55,10 @@ import javax.swing.JMenu; import javax.swing.JMenuBar; import javax.swing.JMenuItem; import javax.swing.JOptionPane; +import javax.swing.JScrollPane; import javax.swing.JToolBar; import javax.swing.ListSelectionModel; -//Added by FR -//import javax.swing.JFrame; -import javax.swing.JScrollPane; -//import java.awt.Container; -//end of block added by FR - import org.pickcellslab.foundationj.annotations.CoreImpl; import org.pickcellslab.foundationj.annotations.ScopeOption; import org.pickcellslab.foundationj.dbm.access.DataAccess; @@ -172,9 +167,9 @@ public class WorkbenchImpl implements Workbench{ .filter(we->Task.class.isAssignableFrom(we.getClass())) .map(we->(Task)we) .collect(Collectors.toList())); -// documentsContainer.add(tasksBar, BorderLayout.WEST); + // Add the vertical scrollbar, it always appears and can be scrolled with bar or mouse wheel JScrollPane spVert = new JScrollPane(tasksBar, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, - JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); + JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); documentsContainer.add(spVert, BorderLayout.WEST); final WebDocumentPane> web = buildDefaultView(access, elements.stream() @@ -188,9 +183,9 @@ public class WorkbenchImpl implements Workbench{ .map(we->(DBViewFactory)we) .collect(Collectors.toList()), web); -// documentsContainer.add(viewsBar, BorderLayout.NORTH); + // Add the horizontal scrollbar, it only appears if needed JScrollPane spHorz = new JScrollPane(viewsBar, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, - JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS); + JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); documentsContainer.add(spHorz, BorderLayout.NORTH); -- GitLab