Changeset 5348 in josm

Timestamp:

Jul 17, 2012 11:47:12 PM (10 months ago)

Author:

Don-vip

Message:

see #7864 - Improvements in rendering of primitives in inactive layers (patch by mrwojo)

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPainter.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPainter.java

@@ -565 +565 @@
         if (selected || member)
         {
-            g.setColor(selected? selectedColor : relationSelectedColor);
+            Color color = null;
+            if (inactive || n.isDisabled()) {
+                color = inactiveColor;
+            } else if (selected) {
+                color = selectedColor;
+            } else {
+                color = relationSelectedColor;
+            }
+            g.setColor(color);
             g.drawRect(p.x-w/2-2, p.y-h/2-2, w+4, h+4);
         }
@@ -862 +870 @@
                     area.contains(centeredNBounds) // slow but nice
             ) {
-                g.setColor(text.color);
+                if (inactive || osm.isDisabled()) {
+                    g.setColor(inactiveColor);
+                } else {
+                    g.setColor(text.color);
+                }
                 Font defaultFont = g.getFont();
                 g.setFont (text.font);
@@ -910 +922 @@
 
         if (selected) {
-            g.setColor(relationSelectedColor);
+            g.setColor(inactive ? inactiveColor : relationSelectedColor);
             g.drawRect((int)(pVia.x+vx+vx2)-w/2-2,(int)(pVia.y+vy+vy2)-h/2-2, w+4, h+4);
         }