Changeset 16458 in josm for trunk

Timestamp:

2020-05-17T23:02:27+02:00 (4 years ago)

Author:

simon04

Message:

fix #19253 - History browser: highlight selected relation member row

Location:

trunk/src/org/openstreetmap/josm/gui/history

Files:

• NodeListTableCellRenderer.java (modified) (3 diffs)
• RelationMemberListTableCellRenderer.java (modified) (3 diffs)
• TagTableCellRenderer.java (modified) (2 diffs)
• TwoColumnDiff.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java

@@ -37 +37 @@
     }
 
-    protected void renderNode(TwoColumnDiff.Item item, boolean isSelected) {
+    protected void renderNode(TwoColumnDiff.Item item, boolean isSelected, boolean hasFocus) {
         String text = "";
         setIcon(nodeIcon);
@@ -43 +43 @@
             text = tr("Node {0}", item.value.toString());
         }
-        Color bgColor = item.state.getColor();
         if (item.state == DiffItemType.EMPTY) {
             text = "";
             setIcon(null);
         }
-        if (isSelected) {
-            bgColor = BGCOLOR_SELECTED;
-        }
         setText(text);
-        GuiHelper.setBackgroundReadable(this, bgColor);
+        GuiHelper.setBackgroundReadable(this, item.state.getColor(isSelected, hasFocus));
     }
 
@@ -61 +57 @@
 
         if (value != null) {
-            renderNode((TwoColumnDiff.Item) value, isSelected);
+            renderNode((TwoColumnDiff.Item) value, isSelected, hasFocus);
         }
         return this;

trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java

@@ -41 +41 @@
         setText(text);
         setToolTipText(text);
-        GuiHelper.setBackgroundReadable(this, diffItem.state.getColor());
     }
 
@@ -57 +56 @@
         setText(text);
         setToolTipText(text);
-        GuiHelper.setBackgroundReadable(this, diffItem.state.getColor());
     }
 
@@ -78 +76 @@
         }
 
+        GuiHelper.setBackgroundReadable(this, member.state.getColor(isSelected, hasFocus));
         return this;
     }

trunk/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java

@@ -7 +7 @@
 import javax.swing.JLabel;
 import javax.swing.JTable;
-import javax.swing.UIManager;
 import javax.swing.table.TableCellRenderer;
 
@@ -34 +33 @@
 
     protected void setBackgroundReadable(String key, TagTableModel model, boolean isSelected, boolean hasFocus, boolean isValue) {
-        Color bgColor = UIManager.getColor("Table.background");
+        final TwoColumnDiff.Item.DiffItemType diffItemType;
         if ((!model.hasTag(key) && model.isCurrentPointInTime())
                 || (!model.oppositeHasTag(key) && model.isReferencePointInTime())) {
-            bgColor = TwoColumnDiff.Item.DiffItemType.DELETED.getColor();
+            diffItemType = TwoColumnDiff.Item.DiffItemType.DELETED;
         } else if ((!model.oppositeHasTag(key) && model.isCurrentPointInTime())
                 || (!model.hasTag(key) && model.isReferencePointInTime())) {
-            bgColor = TwoColumnDiff.Item.DiffItemType.INSERTED.getColor();
+            diffItemType = TwoColumnDiff.Item.DiffItemType.INSERTED;
         } else if (isValue && model.hasTag(key) && model.oppositeHasTag(key) && !model.hasSameValueAsOpposite(key)) {
-            bgColor = TwoColumnDiff.Item.DiffItemType.CHANGED.getColor();
+            diffItemType = TwoColumnDiff.Item.DiffItemType.CHANGED;
+        } else {
+            diffItemType = TwoColumnDiff.Item.DiffItemType.EMPTY;
         }
-        if (isSelected) {
-            if (hasFocus) {
-                bgColor = BGCOLOR_SELECTED_FOCUS;
-            } else {
-                bgColor = BGCOLOR_SELECTED;
-            }
-        }
-
-        GuiHelper.setBackgroundReadable(this, bgColor);
+        GuiHelper.setBackgroundReadable(this, diffItemType.getColor(isSelected, hasFocus));
     }
 

trunk/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java

@@ -46 +46 @@
             public Color getColor() {
                 return color;
+            }
+
+            public Color getColor(boolean isSelected, boolean hasFocus) {
+                if (isSelected && hasFocus) {
+                    return TagTableCellRenderer.BGCOLOR_SELECTED_FOCUS;
+                } else if (isSelected) {
+                    return TagTableCellRenderer.BGCOLOR_SELECTED;
+                } else {
+                    return getColor();
+                }
             }
         }