From b81196a012c0988c3fcc2af335954c4919930bbf Mon Sep 17 00:00:00 2001 From: kuronekochomusuke Date: Sun, 7 Jan 2024 16:13:15 -0500 Subject: [PATCH 1/3] correct conversion exeption causing search to not work --- megamek/src/megamek/client/ui/swing/MiniReportDisplay.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/megamek/src/megamek/client/ui/swing/MiniReportDisplay.java b/megamek/src/megamek/client/ui/swing/MiniReportDisplay.java index 8c793b74548..66d34f3ae86 100644 --- a/megamek/src/megamek/client/ui/swing/MiniReportDisplay.java +++ b/megamek/src/megamek/client/ui/swing/MiniReportDisplay.java @@ -36,6 +36,7 @@ import javax.swing.text.Document; import java.awt.*; import java.awt.event.*; +import java.awt.geom.Rectangle2D; import java.util.Comparator; import java.util.Iterator; import java.util.List; @@ -158,7 +159,7 @@ private void searchTextPane(String searchPattern, Boolean searchDown) { } if (newPos != -1) { - Rectangle r = (Rectangle) textPane.modelToView2D(newPos); + Rectangle r = textPane.modelToView(newPos); int y = UIUtil.calculateCenter(v.getExtentSize().height, v.getViewSize().height, r.height, r.y); v.setViewPosition(new Point(0,y)); textPane.setCaretPosition(newPos); From 362e359d56eac4aff0d0d27dbb7d185bd988a92a Mon Sep 17 00:00:00 2001 From: kuronekochomusuke Date: Sun, 7 Jan 2024 16:14:31 -0500 Subject: [PATCH 2/3] code cleanup --- megamek/src/megamek/client/ui/swing/MiniReportDisplay.java | 1 - 1 file changed, 1 deletion(-) diff --git a/megamek/src/megamek/client/ui/swing/MiniReportDisplay.java b/megamek/src/megamek/client/ui/swing/MiniReportDisplay.java index 66d34f3ae86..f97f5a94069 100644 --- a/megamek/src/megamek/client/ui/swing/MiniReportDisplay.java +++ b/megamek/src/megamek/client/ui/swing/MiniReportDisplay.java @@ -36,7 +36,6 @@ import javax.swing.text.Document; import java.awt.*; import java.awt.event.*; -import java.awt.geom.Rectangle2D; import java.util.Comparator; import java.util.Iterator; import java.util.List; From 1a21761e34292ec942c27c7167cad22852e10c44 Mon Sep 17 00:00:00 2001 From: kuronekochomusuke Date: Sun, 7 Jan 2024 16:27:26 -0500 Subject: [PATCH 3/3] use Rectangle2D --- megamek/src/megamek/client/ui/swing/MiniReportDisplay.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/megamek/src/megamek/client/ui/swing/MiniReportDisplay.java b/megamek/src/megamek/client/ui/swing/MiniReportDisplay.java index f97f5a94069..9b67ce1bd08 100644 --- a/megamek/src/megamek/client/ui/swing/MiniReportDisplay.java +++ b/megamek/src/megamek/client/ui/swing/MiniReportDisplay.java @@ -36,6 +36,7 @@ import javax.swing.text.Document; import java.awt.*; import java.awt.event.*; +import java.awt.geom.Rectangle2D; import java.util.Comparator; import java.util.Iterator; import java.util.List; @@ -158,8 +159,8 @@ private void searchTextPane(String searchPattern, Boolean searchDown) { } if (newPos != -1) { - Rectangle r = textPane.modelToView(newPos); - int y = UIUtil.calculateCenter(v.getExtentSize().height, v.getViewSize().height, r.height, r.y); + Rectangle2D r = textPane.modelToView2D(newPos); + int y = UIUtil.calculateCenter(v.getExtentSize().height, v.getViewSize().height, (int) r.getHeight(), (int) r.getY()); v.setViewPosition(new Point(0,y)); textPane.setCaretPosition(newPos); textPane.moveCaretPosition(newPos + searchPattern.length());