Changeset 11953 in josm for trunk/src/org

Timestamp:

2017-04-19T00:11:05+02:00 (8 years ago)

Author:

bastiK

Message:

see #7427 - make sure layer is painted only once after zoom change

File:

• trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

@@ -722 +722 @@
     @Override
     public void zoomChanged() {
+        zoomChanged(true);
+    }
+
+    private void zoomChanged(boolean invalidate) {
         if (Main.isDebugEnabled()) {
             Main.debug("zoomChanged(): " + currentZoomLevel);
@@ -728 +732 @@
             ((TMSCachedTileLoader) tileLoader).cancelOutstandingTasks();
         }
-        invalidate();
+        if (invalidate) {
+            invalidate();
+        }
     }
 
@@ -783 +789 @@
      */
     public boolean setZoomLevel(int zoom) {
+        return setZoomLevel(zoom, true);
+    }
+
+    private boolean setZoomLevel(int zoom, boolean invalidate) {
         if (zoom == currentZoomLevel) return true;
         if (zoom > this.getMaxZoomLvl()) return false;
         if (zoom < this.getMinZoomLvl()) return false;
         currentZoomLevel = zoom;
-        zoomChanged();
+        zoomChanged(invalidate);
         return true;
     }
@@ -1428 +1438 @@
             }
 
-            setZoomLevel(zoom);
+            setZoomLevel(zoom, false);
 
             // If all tiles at displayZoomLevel is loaded, load all tiles at next zoom level
@@ -1446 +1456 @@
             ts = dts.getTileSet(zoom);
         } else if (getDisplaySettings().isAutoZoom()) {
-            setZoomLevel(zoom);
+            setZoomLevel(zoom, false);
         }