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

Timestamp:

2017-06-08T01:00:48+02:00 (7 years ago)

Author:

michael2402

Message:

Fix #14893: Invalidate geo image / marker layer instead of repainting map view

Location:

trunk/src/org/openstreetmap/josm/gui/layer

Files:

• geoimage/GeoImageLayer.java (modified) (6 diffs)
• geoimage/ShowThumbnailAction.java (modified) (2 diffs)
• geoimage/ThumbsLoader.java (modified) (2 diffs)
• markerlayer/MarkerLayer.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

@@ -95 +95 @@
     volatile boolean thumbsLoaded;
     private BufferedImage offscreenBuffer;
-    boolean updateOffscreenBuffer = true;
+    private boolean updateOffscreenBuffer = true;
 
     private MouseAdapter mouseAdapter;
@@ -638 +638 @@
             ImageViewerDialog.showImage(this, null);
         }
-        updateOffscreenBuffer = true;
-        Main.map.repaint();
+        updateBufferAndRepaint();
     }
 
@@ -940 +939 @@
                     return;
                 if (isVisible() && isMapModeOk()) {
-                    Main.map.mapView.repaint();
                     cycleModeArmed = true;
+                    invalidate();
                 }
             }
@@ -1039 +1038 @@
     @Override
     public void zoomChanged() {
-        updateOffscreenBuffer = true;
+        updateBufferAndRepaint();
     }
 
@@ -1076 +1075 @@
     }
 
+    /**
+     * Marks the offscreen buffer to be updated.
+     */
     public void updateBufferAndRepaint() {
         updateOffscreenBuffer = true;
@@ -1129 +1131 @@
             stopLoadThumbs();
         }
+        invalidate();
     }
 }

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ShowThumbnailAction.java

@@ -11 +11 @@
 import javax.swing.JCheckBoxMenuItem;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.Layer.LayerAction;
@@ -41 +40 @@
     public void actionPerformed(ActionEvent e) {
         layer.setUseThumbs(!layer.isUseThumbs());
-        Main.map.mapView.repaint();
     }
 

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java

@@ -82 +82 @@
 
                 if (layer != null && Main.isDisplayingMapView()) {
-                    layer.updateOffscreenBuffer = true;
-                    Main.map.mapView.repaint();
+                    layer.updateBufferAndRepaint();
                 }
             }
@@ -89 +88 @@
         if (layer != null) {
             layer.thumbsLoaded();
-            layer.updateOffscreenBuffer = true;
-            Main.map.mapView.repaint();
+            layer.updateBufferAndRepaint();
         }
     }

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java

@@ -490 +490 @@
         public void actionPerformed(ActionEvent e) {
             Main.pref.put("marker.show "+layer.getName(), layer.isTextOrIconShown() ? "hide" : "show");
-            Main.map.mapView.repaint();
+            layer.invalidate();
         }