From b11abab19da841879ded9ed7d72e7349c35bd6c2 Mon Sep 17 00:00:00 2001 From: mangofeet Date: Fri, 24 Jun 2022 15:28:30 -0600 Subject: [PATCH 1/4] darken icons on the minimap --- .../src/megamek/client/ui/swing/minimap/Minimap.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/megamek/src/megamek/client/ui/swing/minimap/Minimap.java b/megamek/src/megamek/client/ui/swing/minimap/Minimap.java index bb75d440a36..93318ea8951 100644 --- a/megamek/src/megamek/client/ui/swing/minimap/Minimap.java +++ b/megamek/src/megamek/client/ui/swing/minimap/Minimap.java @@ -945,10 +945,16 @@ private void paintUnit(Graphics g, Entity entity) { Path2D form = MinimapUnitSymbols.getForm(entity); + Color borderColor = new Color(255, 255, 255, 150); + if (entity.moved != EntityMovementType.MOVE_NONE) { + borderColor = borderColor.darker(); + iconColor = iconColor.darker(); + } + if (stratOpsSymbols) { // White border to set off the icon from the background g2.setStroke(new BasicStroke(30f, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_BEVEL)); - g2.setColor(new Color(255, 255, 255, 150)); + g2.setColor(borderColor); g2.draw(STRAT_BASERECT); // Black background to fill forms like the DropShip @@ -1000,7 +1006,7 @@ private void paintUnit(Graphics g, Entity entity) { // Standard symbols // White border to set off the icon from the background g2.setStroke(new BasicStroke(30f, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_ROUND)); - g2.setColor(new Color(255, 255, 255, 150)); + g2.setColor(borderColor); g2.draw(form); // Fill the form in player color / team color From 81fd3d86e03cb56cd57b2f78da100dcdf6481f3b Mon Sep 17 00:00:00 2001 From: mangofeet Date: Fri, 24 Jun 2022 16:22:39 -0600 Subject: [PATCH 2/4] inverted colors instead, colorblind tested --- .../client/ui/swing/minimap/Minimap.java | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/megamek/src/megamek/client/ui/swing/minimap/Minimap.java b/megamek/src/megamek/client/ui/swing/minimap/Minimap.java index 93318ea8951..e9f144c94d7 100644 --- a/megamek/src/megamek/client/ui/swing/minimap/Minimap.java +++ b/megamek/src/megamek/client/ui/swing/minimap/Minimap.java @@ -945,20 +945,23 @@ private void paintUnit(Graphics g, Entity entity) { Path2D form = MinimapUnitSymbols.getForm(entity); - Color borderColor = new Color(255, 255, 255, 150); + Color borderColor = new Color(255, 255, 255, 200); + Color fontColor = new Color(0, 0, 0, 255); if (entity.moved != EntityMovementType.MOVE_NONE) { - borderColor = borderColor.darker(); - iconColor = iconColor.darker(); + Color tmp = borderColor; + borderColor = iconColor; + fontColor = iconColor; + iconColor = tmp; } if (stratOpsSymbols) { // White border to set off the icon from the background - g2.setStroke(new BasicStroke(30f, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_BEVEL)); + g2.setStroke(new BasicStroke(35f, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_BEVEL)); g2.setColor(borderColor); g2.draw(STRAT_BASERECT); // Black background to fill forms like the DropShip - g2.setColor(Color.BLACK); + g2.setColor(fontColor); g2.fill(STRAT_BASERECT); // Rectangle border for all units @@ -976,7 +979,7 @@ private void paintUnit(Graphics g, Entity entity) { g2.fill(form); // Add the weight class or other lettering for certain units - g.setColor(Color.BLACK); + g.setColor(fontColor); if ((entity instanceof Protomech) || (entity instanceof Mech) || (entity instanceof Aero)) { String s = ""; if (entity instanceof Protomech) { @@ -996,7 +999,7 @@ private void paintUnit(Graphics g, Entity entity) { (float) STRAT_SYMBOLSIZE.getHeight() / 3.0f)); } } else if (entity instanceof MechWarrior) { - g2.setColor(Color.black); + g2.setColor(fontColor); g2.fillOval(-25, -25, 50, 50); } // Draw the unit icon in black @@ -1005,7 +1008,7 @@ private void paintUnit(Graphics g, Entity entity) { } else { // Standard symbols // White border to set off the icon from the background - g2.setStroke(new BasicStroke(30f, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_ROUND)); + g2.setStroke(new BasicStroke(35f, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_ROUND)); g2.setColor(borderColor); g2.draw(form); @@ -1014,7 +1017,7 @@ private void paintUnit(Graphics g, Entity entity) { g2.fill(form); // Black border - g2.setColor(Color.BLACK); + g2.setColor(fontColor); g2.setStroke(new BasicStroke(8f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)); g2.draw(form); } From ae39faa9671451bdef8443ac5c68b2bd09639b1a Mon Sep 17 00:00:00 2001 From: mangofeet Date: Fri, 24 Jun 2022 17:15:24 -0600 Subject: [PATCH 3/4] border change with persistent black outline instead (probably final?) --- .../client/ui/swing/minimap/Minimap.java | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/megamek/src/megamek/client/ui/swing/minimap/Minimap.java b/megamek/src/megamek/client/ui/swing/minimap/Minimap.java index e9f144c94d7..1f6e53ec60c 100644 --- a/megamek/src/megamek/client/ui/swing/minimap/Minimap.java +++ b/megamek/src/megamek/client/ui/swing/minimap/Minimap.java @@ -945,19 +945,19 @@ private void paintUnit(Graphics g, Entity entity) { Path2D form = MinimapUnitSymbols.getForm(entity); - Color borderColor = new Color(255, 255, 255, 200); - Color fontColor = new Color(0, 0, 0, 255); + Color borderColor = Color.WHITE; + Color fontColor = Color.BLACK; if (entity.moved != EntityMovementType.MOVE_NONE) { - Color tmp = borderColor; - borderColor = iconColor; - fontColor = iconColor; - iconColor = tmp; + borderColor = Color.BLACK; } + float outerBorderWidth = 30f; + float innerBorderWidth = 20f; + if (stratOpsSymbols) { // White border to set off the icon from the background - g2.setStroke(new BasicStroke(35f, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_BEVEL)); - g2.setColor(borderColor); + g2.setStroke(new BasicStroke(outerBorderWidth, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_BEVEL)); + g2.setColor(Color.BLACK); g2.draw(STRAT_BASERECT); // Black background to fill forms like the DropShip @@ -965,7 +965,8 @@ private void paintUnit(Graphics g, Entity entity) { g2.fill(STRAT_BASERECT); // Rectangle border for all units - g2.setStroke(new BasicStroke(8f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)); + g2.setColor(borderColor); + g2.setStroke(new BasicStroke(innerBorderWidth, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL)); g2.draw(STRAT_BASERECT); // Set a thin brush for filled areas (leave a thick brush for line symbols @@ -1008,8 +1009,8 @@ private void paintUnit(Graphics g, Entity entity) { } else { // Standard symbols // White border to set off the icon from the background - g2.setStroke(new BasicStroke(35f, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_ROUND)); - g2.setColor(borderColor); + g2.setStroke(new BasicStroke(outerBorderWidth, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_ROUND)); + g2.setColor(Color.BLACK); g2.draw(form); // Fill the form in player color / team color @@ -1017,8 +1018,8 @@ private void paintUnit(Graphics g, Entity entity) { g2.fill(form); // Black border - g2.setColor(fontColor); - g2.setStroke(new BasicStroke(8f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)); + g2.setColor(borderColor); + g2.setStroke(new BasicStroke(innerBorderWidth/2, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)); g2.draw(form); } From fe429a8fbb265cab647bfad66825a8722e3ca24e Mon Sep 17 00:00:00 2001 From: mangofeet <44532162+mangofeet@users.noreply.github.com> Date: Fri, 24 Jun 2022 20:38:19 -0600 Subject: [PATCH 4/4] Update megamek/src/megamek/client/ui/swing/minimap/Minimap.java Co-authored-by: Justin Bowen <39067288+Windchild292@users.noreply.github.com> --- megamek/src/megamek/client/ui/swing/minimap/Minimap.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/megamek/src/megamek/client/ui/swing/minimap/Minimap.java b/megamek/src/megamek/client/ui/swing/minimap/Minimap.java index 1f6e53ec60c..813dfd62d72 100644 --- a/megamek/src/megamek/client/ui/swing/minimap/Minimap.java +++ b/megamek/src/megamek/client/ui/swing/minimap/Minimap.java @@ -1019,7 +1019,7 @@ private void paintUnit(Graphics g, Entity entity) { // Black border g2.setColor(borderColor); - g2.setStroke(new BasicStroke(innerBorderWidth/2, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)); + g2.setStroke(new BasicStroke(innerBorderWidth / 2f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)); g2.draw(form); }