Changeset 4327 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java

Timestamp:

2011-08-21T13:12:53+02:00 (15 years ago)

Author:

xeen

Message:

updates visual appearance of highlights and adds them to select and delete action

in more detail:

• add target highlighting to select action
• add target cursor to select action
• add target highlighting to delete action
• unify ctrl/alt/shift modifier detection in MapMode actions
• highlights are now a halo around the way/node instead of a color change
• default highlight color is now the same as the select color (red)
• ability to highlight WaySegments and VirtualNodes
• various style/whitespace nits
• fixes #2411

This patch touches a lot of areas, so please report any regressions in the map mode
tools. Also please add a comment to #2411 if you find to highlighting in select
mode distracting, so it can be fine tuned (or turned off by default).

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java

@@ -111 +111 @@
             symbol = createSymbol(env);
         }
-        
+
         // optimization: if we neither have a symbol, nor an icon
         // we don't have to check for the remaining style properties and we don't
@@ -243 +243 @@
                 Color fillColor = symbol.fillColor;
                 if (fillColor != null) {
-                    if (n.isHighlighted()) {
-                        fillColor = settings.getHighlightColor();
-                    } else {
-                        if (painter.isInactiveMode() || n.isDisabled()) {
-                            fillColor = settings.getInactiveColor();
-                        } else if (selected) {
-                            fillColor = settings.getSelectedColor(fillColor.getAlpha());
-                        } else if (member) {
-                            fillColor = settings.getRelationSelectedColor(fillColor.getAlpha());
-                        }
+                    if (painter.isInactiveMode() || n.isDisabled()) {
+                        fillColor = settings.getInactiveColor();
+                    } else if (selected) {
+                        fillColor = settings.getSelectedColor(fillColor.getAlpha());
+                    } else if (member) {
+                        fillColor = settings.getRelationSelectedColor(fillColor.getAlpha());
                     }
                 }
                 Color strokeColor = symbol.strokeColor;
                 if (strokeColor != null) {
-                    if (n.isHighlighted()) {
-                        strokeColor = settings.getHighlightColor();
-                    } else {
-                        if (painter.isInactiveMode() || n.isDisabled()) {
-                            strokeColor = settings.getInactiveColor();
-                        } else if (selected) {
-                            strokeColor = settings.getSelectedColor(strokeColor.getAlpha());
-                        } else if (member) {
-                            strokeColor = settings.getRelationSelectedColor(strokeColor.getAlpha());
-                        }
+                    if (painter.isInactiveMode() || n.isDisabled()) {
+                        strokeColor = settings.getInactiveColor();
+                    } else if (selected) {
+                        strokeColor = settings.getSelectedColor(strokeColor.getAlpha());
+                    } else if (member) {
+                        strokeColor = settings.getRelationSelectedColor(strokeColor.getAlpha());
                     }
                 }
                 painter.drawNodeSymbol(n, symbol, fillColor, strokeColor);
             } else {
-                if (n.isHighlighted()) {
-                    painter.drawNode(n, settings.getHighlightColor(), settings.getSelectedNodeSize(), settings.isFillSelectedNode());
+                Color color;
+                boolean isConnection = n.isConnectionNode();
+
+                if (painter.isInactiveMode() || n.isDisabled()) {
+                    color = settings.getInactiveColor();
+                } else if (selected) {
+                    color = settings.getSelectedColor();
+                } else if (member) {
+                    color = settings.getRelationSelectedColor();
+                } else if (isConnection) {
+                    if (n.isTagged()) {
+                        color = settings.getTaggedConnectionColor();
+                    } else {
+                        color = settings.getConnectionColor();
+                    }
                 } else {
-                    Color color;
-                    boolean isConnection = n.isConnectionNode();
-
-                    if (painter.isInactiveMode() || n.isDisabled()) {
-                        color = settings.getInactiveColor();
-                    } else if (selected) {
-                        color = settings.getSelectedColor();
-                    } else if (member) {
-                        color = settings.getRelationSelectedColor();
-                    } else if (isConnection) {
-                        if (n.isTagged()) {
-                            color = settings.getTaggedConnectionColor();
-                        } else {
-                            color = settings.getConnectionColor();
-                        }
+                    if (n.isTagged()) {
+                        color = settings.getTaggedColor();
                     } else {
-                        if (n.isTagged()) {
-                            color = settings.getTaggedColor();
-                        } else {
-                            color = settings.getNodeColor();
-                        }
+                        color = settings.getNodeColor();
                     }
-
-                    final int size = Utils.max((selected ? settings.getSelectedNodeSize() : 0),
-                            (n.isTagged() ? settings.getTaggedNodeSize() : 0),
-                            (isConnection ? settings.getConnectionNodeSize() : 0),
-                            settings.getUnselectedNodeSize());
-
-                    final boolean fill = (selected && settings.isFillSelectedNode()) ||
-                            (n.isTagged() && settings.isFillTaggedNode()) ||
-                            (isConnection && settings.isFillConnectionNode()) ||
-                            settings.isFillUnselectedNode();
-
-                    painter.drawNode(n, color, size, fill);
                 }
+
+                final int size = Utils.max((selected ? settings.getSelectedNodeSize() : 0),
+                        (n.isTagged() ? settings.getTaggedNodeSize() : 0),
+                        (isConnection ? settings.getConnectionNodeSize() : 0),
+                        settings.getUnselectedNodeSize());
+
+                final boolean fill = (selected && settings.isFillSelectedNode()) ||
+                (n.isTagged() && settings.isFillTaggedNode()) ||
+                (isConnection && settings.isFillConnectionNode()) ||
+                settings.isFillUnselectedNode();
+
+                painter.drawNode(n, color, size, fill);
+
             }
         } else if (primitive instanceof Relation && icon != null) {
@@ -322 +311 @@
         return disabledIcon = new ImageIcon(GrayFilter.createDisabledImage(icon.getImage()));
     }
-    
+
     public Rectangle getBox() {
         if (icon != null) {