From 71b972f23ba9e5581dc7ac2073a9a387aa24ed68 Mon Sep 17 00:00:00 2001 From: ghidragon <106987263+ghidragon@users.noreply.github.com> Date: Mon, 12 Dec 2022 13:21:08 -0500 Subject: [PATCH] GP-2924 fixed null pointer exception in Project Lock dialog --- .../src/main/java/generic/text/TextLayoutGraphics.java | 5 +++-- .../Gui/src/main/java/ghidra/util/HTMLUtilities.java | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Ghidra/Framework/Generic/src/main/java/generic/text/TextLayoutGraphics.java b/Ghidra/Framework/Generic/src/main/java/generic/text/TextLayoutGraphics.java index f15a9f9d37..2823e9ec39 100644 --- a/Ghidra/Framework/Generic/src/main/java/generic/text/TextLayoutGraphics.java +++ b/Ghidra/Framework/Generic/src/main/java/generic/text/TextLayoutGraphics.java @@ -497,8 +497,9 @@ public class TextLayoutGraphics extends Graphics2D { @Override public AffineTransform getTransform() { - // stub - return null; + // Some UIs (e.g. FlatLookAndFeel) expect a transform to be applied in some situations + // depending on high resolution monitor settings + return new AffineTransform(); } @Override diff --git a/Ghidra/Framework/Gui/src/main/java/ghidra/util/HTMLUtilities.java b/Ghidra/Framework/Gui/src/main/java/ghidra/util/HTMLUtilities.java index 90d8e28852..0fddc97093 100644 --- a/Ghidra/Framework/Gui/src/main/java/ghidra/util/HTMLUtilities.java +++ b/Ghidra/Framework/Gui/src/main/java/ghidra/util/HTMLUtilities.java @@ -773,6 +773,7 @@ public class HTMLUtilities { new Rectangle(-size.width, -size.height, size.width * 2, size.height * 10); TextLayoutGraphics g = new TextLayoutGraphics(); + g.setClip(bounds); label.paint(g); g.flush();