diff --git a/Ghidra/Features/Base/src/main/help/help/topics/CodeBrowserPlugin/CodeBrowser.htm b/Ghidra/Features/Base/src/main/help/help/topics/CodeBrowserPlugin/CodeBrowser.htm index 8df9a10103..6e98541b5d 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/CodeBrowserPlugin/CodeBrowser.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/CodeBrowserPlugin/CodeBrowser.htm @@ -253,14 +253,17 @@ - - <Shift> + + + + <Shift> + Press shift when using the mouse scroll wheel to perform horizontal scrolling. This will only work when the horizontal scroll bar is visible. -
+

diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/XRefHeaderFieldFactory.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/XRefHeaderFieldFactory.java index 2eb430c9bb..7c26e0a03a 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/XRefHeaderFieldFactory.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/XRefHeaderFieldFactory.java @@ -127,7 +127,7 @@ public class XRefHeaderFieldFactory extends XRefFieldFactory { *
* Where:
* m is the number of cross references
- * n is the number of off-cut cross references

+ * n is the number of offcut cross references

*/ private String getXRefHeaderString(CodeUnit cu) { if (cu == null) { @@ -135,20 +135,27 @@ public class XRefHeaderFieldFactory extends XRefFieldFactory { } List xrefs = XReferenceUtils.getXReferences(cu, maxXRefs); - int xrefCount = xrefs.size(); + int xRefCount = xrefs.size(); + + String xRefCountText = Integer.toString(xRefCount); + if (xRefCount == maxXRefs) { + xRefCountText += "+"; + } + List offcuts = XReferenceUtils.getOffcutXReferences(cu, maxXRefs); int offcutCount = offcuts.size(); - if (offcutCount > 0) { - String modifier = ""; - if (offcutCount == maxXRefs) { - modifier = "+"; - } - return "XREF[" + xrefCount + "," + offcutCount + modifier + "]: "; + String offcutCountText = Integer.toString(offcutCount); + if (offcutCount == maxXRefs) { + offcutCountText += "+"; } - if (xrefCount > 0) { - return "XREF[" + xrefCount + "]: "; + if (offcutCount > 0) { + return "XREF[" + xRefCountText + "," + offcutCountText + "]: "; + } + + if (xRefCount > 0) { + return "XREF[" + xRefCountText + "]: "; } return null; }