From 06b267ed5fe899097b6306ba3333efcbc67513a2 Mon Sep 17 00:00:00 2001
From: Dan <46821332+nsadeveloper789@users.noreply.github.com>
Date: Tue, 8 Aug 2023 10:58:04 -0400
Subject: [PATCH] GP-3722: Fix vertical alignment of labels after GP-3469.

---
 .../debug/gui/listing/DebuggerListingProvider.java     | 10 ++++------
 .../debug/gui/memory/DebuggerMemoryBytesProvider.java  | 10 ++++------
 2 files changed, 8 insertions(+), 12 deletions(-)

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
index 0ad6de4a01..cb39bbb0e3 100644
--- 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
@@ -17,8 +17,8 @@ package ghidra.app.plugin.core.debug.gui.listing;
 
 import static ghidra.app.plugin.core.debug.gui.DebuggerResources.ICON_REGISTER_MARKER;
 
+import java.awt.BorderLayout;
 import java.awt.Color;
-import java.awt.Dimension;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.lang.invoke.MethodHandles;
@@ -26,8 +26,8 @@ import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import javax.swing.Box;
 import javax.swing.JLabel;
+import javax.swing.JPanel;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
@@ -334,11 +334,9 @@ public class DebuggerListingProvider extends CodeViewerProvider {
 
 		addDisplayListener(readsMemTrait.getDisplayListener());
 
-		Box northPanel = Box.createHorizontalBox();
+		JPanel northPanel = new JPanel(new BorderLayout());
 		northPanel.add(locationLabel);
-		locationLabel.setMinimumSize(new Dimension(0, 0));
-		northPanel.add(Box.createGlue());
-		northPanel.add(trackingLabel);
+		northPanel.add(trackingLabel, BorderLayout.EAST);
 		this.setNorthComponent(northPanel);
 		if (isConnected) {
 			setTitle(DebuggerResources.TITLE_PROVIDER_LISTING);
diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/memory/DebuggerMemoryBytesProvider.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/memory/DebuggerMemoryBytesProvider.java
index 92597edbad..95e7009105 100644
--- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/memory/DebuggerMemoryBytesProvider.java
+++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/memory/DebuggerMemoryBytesProvider.java
@@ -16,14 +16,14 @@
 package ghidra.app.plugin.core.debug.gui.memory;
 
 import java.awt.BorderLayout;
-import java.awt.Dimension;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.lang.invoke.MethodHandles;
 import java.math.BigInteger;
 import java.util.*;
 
-import javax.swing.*;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
 
 import org.apache.commons.lang3.StringUtils;
 
@@ -207,11 +207,9 @@ public class DebuggerMemoryBytesProvider extends ProgramByteViewerComponentProvi
 		createActions();
 		addDisplayListener(readsMemTrait.getDisplayListener());
 
-		Box northPanel = Box.createHorizontalBox();
+		JPanel northPanel = new JPanel(new BorderLayout());
 		northPanel.add(locationLabel);
-		locationLabel.setMinimumSize(new Dimension(0, 0));
-		northPanel.add(Box.createGlue());
-		northPanel.add(trackingLabel);
+		northPanel.add(trackingLabel, BorderLayout.EAST);
 		decorationComponent.add(northPanel, BorderLayout.NORTH);
 
 		goToTrait.goToCoordinates(current);