Changeset 15457 in josm for trunk/src/org/openstreetmap

Timestamp:

2019-10-15T20:40:50+02:00 (5 years ago)

Author:

Don-vip

Message:

see #17221 - make layer numbering an expert feature, configurable with layerlist.display.numbers advanced preference

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

@@ -39 +39 @@
 import javax.swing.table.TableModel;
 
+import org.openstreetmap.josm.actions.ExpertToggleAction;
 import org.openstreetmap.josm.actions.MergeLayerAction;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.imagery.OffsetBookmark;
 import org.openstreetmap.josm.data.preferences.AbstractProperty;
+import org.openstreetmap.josm.data.preferences.AbstractProperty.ValueChangeListener;
+import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapFrame;
@@ -97 +100 @@
     private static volatile LayerListDialog instance;
 
+    private static final BooleanProperty DISPLAY_NUMBERS = new BooleanProperty("layerlist.display.numbers", true);
+
     /**
      * Creates the instance of the dialog. It's connected to the layer manager
@@ -127 +132 @@
     /** the list of layers (technically its a JTable, but appears like a list) */
     private final LayerList layerList;
+    private final ValueChangeListener<? super Boolean> displayNumbersPrefListener;
 
     private final ActivateLayerAction activateLayerAction;
@@ -219 +225 @@
         layerList.getColumnModel().getColumn(2).setResizable(false);
 
+        int width = getLayerNumberWidth();
         layerList.getColumnModel().getColumn(3).setCellRenderer(new LayerVisibleCellRenderer());
         layerList.getColumnModel().getColumn(3).setCellEditor(new LayerVisibleCellEditor(new LayerVisibleCheckBox()));
-        layerList.getColumnModel().getColumn(3).setMaxWidth(48);
-        layerList.getColumnModel().getColumn(3).setPreferredWidth(48);
+        layerList.getColumnModel().getColumn(3).setMaxWidth(width);
+        layerList.getColumnModel().getColumn(3).setPreferredWidth(width);
         layerList.getColumnModel().getColumn(3).setResizable(false);
 
@@ -247 +254 @@
         }
 
+        displayNumbersPrefListener = change -> {
+            int numberWidth = getLayerNumberWidth();
+            layerList.getColumnModel().getColumn(3).setMaxWidth(numberWidth);
+            layerList.getColumnModel().getColumn(3).setPreferredWidth(numberWidth);
+            repaint();
+        };
+        DISPLAY_NUMBERS.addListener(displayNumbersPrefListener);
+
         // init the model
         //
@@ -326 +341 @@
     }
 
+    private static boolean displayLayerNumbers() {
+        return ExpertToggleAction.isExpert() && DISPLAY_NUMBERS.get();
+    }
+
+    private static int getLayerNumberWidth() {
+        return displayLayerNumbers() ? 48 : 16;
+    }
+
     /**
      * Gets the layer manager this dialog is for.
@@ -367 +390 @@
         JumpToMarkerActions.unregisterActions();
         layerList.setTransferHandler(null);
+        DISPLAY_NUMBERS.removeListener(displayNumbersPrefListener);
         super.destroy();
         instance = null;
@@ -419 +443 @@
             boolean visible = layer.isVisible();
             setSelected(visible);
-            List<Layer> layers = MainApplication.getLayerManager().getLayers();
-            int num = layers.size() - layers.indexOf(layer);
-            setText(String.format("%s[%d]", num < 10 ? " " : "", num));
+            if (displayLayerNumbers()) {
+                List<Layer> layers = MainApplication.getLayerManager().getLayers();
+                int num = layers.size() - layers.indexOf(layer);
+                setText(String.format("%s[%d]", num < 10 ? " " : "", num));
+            } else {
+                setText(null);
+            }
             setTranslucent(layer.getOpacity() < 1.0);
             setToolTipText(visible ?