Merge pull request #5726 from kwvanderlinde/bugfix/5725-bar-scrolling

Improve scrolling for states and bars

Author: bubblobill

src/main/java/net/rptools/maptool/client/ui/token/dialog/edit/EditTokenDialog.java

@@ -173,6 +173,13 @@ public void initStatSheetComboBoxes() {
         });
   }
 
+  public void initStatesAndBarsPanel() {
+    var test = (JScrollPane) getComponent("statesAndBarsScrollPane");
+    // This number is a bit arbitrary, but importantly it is much bigger than the default of 1 pixel
+    // but still likely to be smaller than a single bar's height.
+    test.getVerticalScrollBar().setUnitIncrement(20);
+  }
+
   public void initTerrainModifierOperationComboBox() {
     getTerrainModifierOperationComboBox()
         .setModel(new DefaultComboBoxModel<>(TerrainModifierOperation.values()));
@@ -1058,7 +1065,7 @@ private void updateStatesPanel() {
 
     /* Add sliders to the bar panel */
     var barsPanel = getBarsPanel();
-    barsPanel.setLayout(new MigLayout("wrap 1", "[fill,grow]"));
+    barsPanel.setLayout(new MigLayout("wrap 2,gapx 5%", "[fill,grow][fill,grow]"));
     barsPanel.removeAll();
     if (MapTool.getCampaign().getTokenBarsMap().isEmpty()) {
       barsPanel.setVisible(false);
@@ -1067,20 +1074,22 @@ private void updateStatesPanel() {
       for (BarTokenOverlay bar : MapTool.getCampaign().getTokenBarsMap().values()) {
         JSlider slider = new JSlider(0, 100);
         JCheckBox hide = new JCheckBox(I18N.getString("EditTokenDialog.checkbox.state.hide"));
-        hide.putClientProperty("JSlider", slider);
         hide.addChangeListener(
             e -> {
-              JSlider js = (JSlider) ((JCheckBox) e.getSource()).getClientProperty("JSlider");
-              js.setEnabled(!((JCheckBox) e.getSource()).isSelected());
+              slider.setEnabled(!((JCheckBox) e.getSource()).isSelected());
             });
         slider.setName(bar.getName());
         slider.setPaintLabels(true);
         slider.setPaintTicks(true);
-        slider.setMajorTickSpacing(20);
-        slider.createStandardLabels(20);
-        slider.setMajorTickSpacing(10);
+        slider.setMajorTickSpacing(25);
+        slider.setLabelTable(slider.createStandardLabels(50));
+        slider.setMinorTickSpacing(5);
+
+        // Sliders by default have a fixed preferred size. Overriding it to zero will instead let
+        // MigLayout grow the slider to fill the space.
+        slider.setPreferredSize(new Dimension(0, 0));
 
-        JPanel tokenbarPanel = new JPanel(new MigLayout("wrap 2", "[fill,grow][fill,grow]"));
+        JPanel tokenbarPanel = new JPanel(new MigLayout("wrap 2", "[fill][fill,grow]"));
         tokenbarPanel.add(new JLabel(bar.getName() + ":"));
         tokenbarPanel.add(slider, "span 1 2 align right");
         tokenbarPanel.add(hide);
@@ -1992,7 +2001,7 @@ public MTMultilineStringPopupPanel(String paramString) {
         log.error("Error while loading multiline property editor theme", e);
       }
       JScrollPane localJScrollPane = new RTextScrollPane(j);
-      localJScrollPane.setVerticalScrollBarPolicy(22);
+      localJScrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS);
       localJScrollPane.setAutoscrolls(true);
       localJScrollPane.setPreferredSize(new Dimension(300, 200));
       setBorder(BorderFactory.createEmptyBorder(10, 5, 5, 5));

src/main/java/net/rptools/maptool/client/ui/token/dialog/edit/TokenPropertiesDialog.form

@@ -552,7 +552,6 @@
                         <constraints>
                           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
                         </constraints>
-                        <properties/>
                       </component>
                     </children>
                   </grid>
@@ -1113,6 +1112,7 @@
                 </constraints>
                 <properties>
                   <horizontalScrollBarPolicy value="31"/>
+                  <name value="statesAndBarsScrollPane"/>
                 </properties>
                 <border type="empty"/>
                 <children>