Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-10-23 21:50:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-3722_Dan_fixVerticalAlignmentOfDynamicListingInfoLabels' into patch

Browse Source
This commit is contained in:
Ryan Kurtz 2023-08-09 13:11:54 -04:00
commit 2b41176a11
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/listing/DebuggerListingProvider.java
View File

@ -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);

10
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/memory/DebuggerMemoryBytesProvider.java
View File

@ -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);