Changeset 29385 in osm for applications/viewer/jmapviewer/src/org/openstreetmap

Timestamp:

2013-03-23T07:12:15+01:00 (12 years ago)

Author:

the111

Message:

Fix #josm8534 - AttributionSupport does not clear out old link bounds values

File:

• applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/AttributionSupport.java (modified) (4 diffs)

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/AttributionSupport.java

@@ -55 +55 @@
 
     public void paintAttribution(Graphics g, int width, int height, Coordinate topLeft, Coordinate bottomRight, int zoom, ImageObserver observer) {
-        if (source == null || !source.requiresAttribution())
-            return;
+        if (source == null || !source.requiresAttribution()) {
+            attrToUBounds = null;
+            attrImageBounds = null;
+            attrTextBounds = null;
+            return;            
+        }
+        
         // Draw attribution
         Font font = g.getFont();
@@ -78 +83 @@
             g.setColor(Color.white);
             g.drawString(attrTermsText, x, y);
+        } else {
+            attrToUBounds = null;
         }
 
@@ -88 +95 @@
             attrImageBounds = new Rectangle(x, y, imgWidth, imgHeight);
             g.drawImage(attrImage, x, y, null);
+        } else {
+            attrImageBounds = null;
         }
 
@@ -102 +111 @@
             g.drawString(attributionText, x, y);
             attrTextBounds = new Rectangle(x, y-textHeight, (int) stringBounds.getWidth(), (int) stringBounds.getHeight());
+        } else {
+            attrTextBounds = null;
         }