Changeset 12174 in josm for trunk

Timestamp:

2017-05-15T18:09:18+02:00 (8 years ago)

Author:

michael2402

Message:

Map paint style: Invalidate the affected layers instead of triggering a full repaint.

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapView.java (modified) (1 diff)
• mappaint/MapPaintStyles.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/MapView.java

@@ -669 +669 @@
             }
         }
+        // invalidate repaint cache. The layer order may have changed by this, so we invalidate every layer
+        getLayerManager().getLayers().forEach(invalidatedListener::invalidate);
         AudioPlayer.reset();
-        repaint();
     }
 

trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java

@@ -24 +24 @@
 import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
+import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
 import org.openstreetmap.josm.gui.mappaint.styleelement.MapImage;
@@ -340 +342 @@
                 fireMapPaintSylesUpdated();
                 styles.clearCached();
-                if (Main.isDisplayingMapView()) {
-                    Main.map.mapView.preferenceChanged(null);
-                    Main.map.mapView.repaint();
-                }
+
+                // Trigger a repaint of all data layers
+                Main.getLayerManager().getLayers()
+                    .stream()
+                    .filter(layer -> layer instanceof OsmDataLayer)
+                    .forEach(Layer::invalidate);
             });
         }