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

Timestamp:

2012-09-20T03:10:12+02:00 (13 years ago)

Author:

Don-vip

Message:

Fix graphical glitch caused by setXORMode with Direct3D, introduced by r5500

File:

• trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (modified) (4 diffs)

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

@@ -42 +42 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.WaySegment;
+import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
 import org.openstreetmap.josm.data.projection.Projection;
@@ -48 +49 @@
 import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
 import org.openstreetmap.josm.tools.Predicate;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -111 +113 @@
     protected EastNorth center = calculateDefaultCenter();
 
-    private static final Object paintRequestLock = new Object();
+    private final Object paintRequestLock = new Object();
     private Rectangle paintRect = null;
     private Polygon paintPoly = null;
@@ -1279 +1281 @@
             if (paintRect != null) {
                 Graphics g2 = g.create();
-                g2.setColor(Color.BLACK);
-                g2.setXORMode(Color.WHITE);
+                g2.setColor(Utils.complement(PaintColors.getBackgroundColor()));
                 g2.drawRect(paintRect.x, paintRect.y, paintRect.width, paintRect.height);
+                g2.dispose();
             }
             if (paintPoly != null) {
                 Graphics g2 = g.create();
-                g2.setColor(Color.WHITE);
+                g2.setColor(Utils.complement(PaintColors.getBackgroundColor()));
                 g2.drawPolyline(paintPoly.xpoints, paintPoly.ypoints, paintPoly.npoints);
+                g2.dispose();
             }
         }