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

Timestamp:

2020-01-26T18:26:28+01:00 (5 years ago)

Author:

simon04

Message:

fix #17639 - Relation editotr: invert color of icons when line is selected

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java

@@ -67 +67 @@
         /* vertical lines */
         if (value.onewayFollowsNext && value.onewayFollowsPrevious) {
-            g.setColor(Color.black);
+            // foreground is set via renderBackgroundForeground
+            g.setColor(getForeground());
         } else {
-            g.setColor(Color.lightGray);
+            g.setColor(getForeground().brighter());
         }
         if (value.isLoop) {
@@ -140 +141 @@
         if (value.linkPrev) {
             if (value.onewayFollowsPrevious) {
-                g.setColor(Color.black);
-            } else {
-                g.setColor(Color.lightGray);
+                g.setColor(getForeground());
+            } else {
+                g.setColor(getForeground().brighter());
             }
             if (value.isOnewayHead) {
@@ -152 +153 @@
         } else {
             if (value.isLoop) {
-                g.setColor(Color.black);
+                g.setColor(getForeground());
                 y1 = 5;
                 g.drawImage(CORNERS, xoff, y1-3, xoff+3, y1, 0, 0, 3, 3, new Color(0, 0, 0, 0), null);
@@ -175 +176 @@
         if (value.linkNext) {
             if (value.onewayFollowsNext) {
-                g.setColor(Color.black);
-            } else {
-                g.setColor(Color.lightGray);
+                g.setColor(getForeground());
+            } else {
+                g.setColor(getForeground().brighter());
             }
             if (value.isOnewayTail) {
@@ -187 +188 @@
         } else {
             if (value.isLoop) {
-                g.setColor(Color.black);
+                g.setColor(getForeground());
                 y2 = ymax - 5;
                 g.fillRect(xoff-1, y2+2, 3, 3);