Merge remote-tracking branch 'origin/GP-2294_Dan_highlightPriorities'

ryanmkurtz · ryanmkurtz · commit 8f8123caf1be · 2022-08-02T01:14:54.000-04:00
diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/listing/DebuggerListingProvider.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/listing/DebuggerListingProvider.java
@@ -495,7 +495,8 @@ protected void createNewStaticTrackingMarker() {
 		if (markerService != null && markedAddress != null) {
 			trackingMarker = markerService.createPointMarker("Tracked Register",
 				"An address stored by a trace register, mapped to a static program", markedProgram,
-				0, true, true, true, trackingColor, ICON_REGISTER_MARKER, true);
+				MarkerService.HIGHLIGHT_PRIORITY + 1, true, true, true, trackingColor,
+				ICON_REGISTER_MARKER, true);
 			trackingMarker.add(markedAddress);
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -495,7 +495,8 @@ protected void createNewStaticTrackingMarker() {`
`495`	`495`	`if (markerService != null && markedAddress != null) {`
`496`	`496`	`trackingMarker = markerService.createPointMarker("Tracked Register",`
`497`	`497`	`"An address stored by a trace register, mapped to a static program", markedProgram,`
`498`		`- 0, true, true, true, trackingColor, ICON_REGISTER_MARKER, true);`
	`498`	`+ MarkerService.HIGHLIGHT_PRIORITY + 1, true, true, true, trackingColor,`
	`499`	`+ ICON_REGISTER_MARKER, true);`
`499`	`500`	`trackingMarker.add(markedAddress);`
`500`	`501`	`}`
`501`	`502`	`}`