Merge remote-tracking branch 'origin/GP-6640-dragonmacher-xrefs-more-plus'

This commit is contained in:
Ryan Kurtz
2026-04-13 19:00:23 -04:00
2 changed files with 23 additions and 13 deletions
@@ -253,14 +253,17 @@
</TR>
<TR>
<A NAME="Keyboard_Controls_Shift">
<TD width="21%" valign="top">&lt;Shift&gt;</TD>
<TD width="21%" valign="top">
<A NAME="Keyboard_Controls_Shift" />
&lt;Shift&gt;
</TD>
<TD width="79%">Press shift when using the mouse scroll wheel to perform
horizontal scrolling. This will only work when the horizontal scroll
bar is visible.
<BLOCKQUOTE>
<BLOCKQUOTE>
<P>
<IMG border="0" src="help/shared/note.png" alt="">
@@ -127,7 +127,7 @@ public class XRefHeaderFieldFactory extends XRefFieldFactory {
* <br>
* Where:<br>
* m is the number of cross references <br>
* n is the number of off-cut cross references <br><br>
* n is the number of offcut cross references <br><br>
*/
private String getXRefHeaderString(CodeUnit cu) {
if (cu == null) {
@@ -135,20 +135,27 @@ public class XRefHeaderFieldFactory extends XRefFieldFactory {
}
List<Reference> xrefs = XReferenceUtils.getXReferences(cu, maxXRefs);
int xrefCount = xrefs.size();
int xRefCount = xrefs.size();
String xRefCountText = Integer.toString(xRefCount);
if (xRefCount == maxXRefs) {
xRefCountText += "+";
}
List<Reference> 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;
}