Fix alignment and size of elements in the AssetPanel.

Changed the layout type from a GridLayout to a dynamic WrapLayout.
gurkenlabs · Dec 27, 2019 · 04223a4 · 04223a4
1 parent 5964444
commit 04223a4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 27 deletions.
diff --git a/utiliti/src/de/gurkenlabs/utiliti/swing/AssetPanel.java b/utiliti/src/de/gurkenlabs/utiliti/swing/AssetPanel.java
@@ -1,6 +1,5 @@
 package de.gurkenlabs.utiliti.swing;
 
-import java.awt.GridLayout;
 import java.util.Collections;
 import java.util.List;
 
@@ -22,23 +21,21 @@
 
 @SuppressWarnings("serial")
 public class AssetPanel extends JPanel {
-  private static final int COLUMNS = 10;
-  private final GridLayout gridLayout;
+  private final WrapLayout layout;
 
   public AssetPanel() {
-    this.gridLayout = new GridLayout(3, COLUMNS);
-    this.gridLayout.setVgap(5);
-    this.gridLayout.setHgap(5);
-    this.setLayout(this.gridLayout);
+    this.layout = new WrapLayout();
+    this.layout.setVgap(5);
+    this.layout.setHgap(5);
+    this.layout.setAlignment(WrapLayout.LEFT);
+    this.setLayout(this.layout);
 
     this.setBorder(new EmptyBorder(5, 5, 5, 5));
     this.setBackground(Style.COLOR_ASSETPANEL_BACKGROUND);
-
-    // TODO: implement support for arrow keys to change focus
   }
 
   public void loadSprites(List<SpritesheetResource> infos) {
-    this.load(infos, () -> {
+    this.load(() -> {
       Collections.sort(infos);
       for (SpritesheetResource info : infos) {
         Icon icon;
@@ -58,7 +55,7 @@ public void loadSprites(List<SpritesheetResource> infos) {
   }
 
   public void loadTilesets(List<Tileset> tilesets) {
-    this.load(tilesets, () -> {
+    this.load(() -> {
       Collections.sort(tilesets);
       for (Tileset tileset : tilesets) {
         AssetPanelItem panelItem = new AssetPanelItem(Icons.DOC_TILESET, tileset.getName(), tileset);
@@ -69,7 +66,7 @@ public void loadTilesets(List<Tileset> tilesets) {
   }
 
   public void loadEmitters(List<EmitterData> emitters) {
-    this.load(emitters, () -> {
+    this.load(() -> {
       Collections.sort(emitters);
       for (EmitterData emitter : emitters) {
         AssetPanelItem panelItem = new AssetPanelItem(Icons.DOC_EMITTER, emitter.getName(), emitter);
@@ -80,7 +77,7 @@ public void loadEmitters(List<EmitterData> emitters) {
   }
 
   public void loadBlueprints(List<Blueprint> blueprints) {
-    this.load(blueprints, () -> {
+    this.load(() -> {
       Collections.sort(blueprints);
       for (MapObject blueprint : blueprints) {
         AssetPanelItem panelItem = new AssetPanelItem(Icons.DOC_BLUEPRINT, blueprint.getName(), blueprint);
@@ -91,7 +88,7 @@ public void loadBlueprints(List<Blueprint> blueprints) {
   }
 
   public void loadSounds(List<SoundResource> sounds) {
-    this.load(sounds, () -> {
+    this.load(() -> {
       Collections.sort(sounds);
       for (SoundResource sound : sounds) {
         AssetPanelItem panelItem = new AssetPanelItem(Icons.DOC_SOUND, sound.getName(), sound);
@@ -101,20 +98,9 @@ public void loadSounds(List<SoundResource> sounds) {
     });
   }
 
-  public <T> void load(List<T> list, Runnable runnable) {
+  public <T> void load(Runnable runnable) {
     this.removeAll();
-    this.gridLayout.setRows(Math.max(list.size() / COLUMNS, 2));
-
     runnable.run();
-
-    if (list.size() < COLUMNS * 2) {
-      for (int i = 0; i < COLUMNS * 2 - list.size(); i++) {
-        JPanel placeholder = new JPanel();
-        placeholder.setOpaque(false);
-        this.add(placeholder);
-      }
-    }
-
     this.getRootPane().repaint();
   }
 }
diff --git a/utiliti/src/de/gurkenlabs/utiliti/swing/controllers/AssetList.java b/utiliti/src/de/gurkenlabs/utiliti/swing/controllers/AssetList.java
@@ -40,7 +40,7 @@ public AssetList() {
       }
     });
 
-    JScrollPane scrollPane = new JScrollPane(assetPanel);
+    JScrollPane scrollPane = new JScrollPane(assetPanel, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
 
     this.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, evt -> Editor.preferences().setAssetsSplitter(this.getDividerLocation()));
     this.setDividerLocation(Editor.preferences().getMainSplitterPosition() != 0 ? Editor.preferences().getAssetsSplitter() : 200);