Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-10-24 06:01:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

GP-3722: Fix vertical alignment of labels after GP-3469.

Browse Source
This commit is contained in:
Dan 2023-08-08 10:58:04 -04:00
parent 5888ac64e1
commit 06b267ed5f
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 static ghidra.app.plugin.core.debug.gui.DebuggerResources.ICON_REGISTER_MARKER;
import java.awt.BorderLayout;
import java.awt.Color; import java.awt.Color;
import java.awt.Dimension;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodHandles;
@ -26,8 +26,8 @@ import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.swing.Box;
import javax.swing.JLabel; import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener; import javax.swing.event.ChangeListener;
@ -334,11 +334,9 @@ public class DebuggerListingProvider extends CodeViewerProvider {
addDisplayListener(readsMemTrait.getDisplayListener()); addDisplayListener(readsMemTrait.getDisplayListener());
Box northPanel = Box.createHorizontalBox(); JPanel northPanel = new JPanel(new BorderLayout());
northPanel.add(locationLabel); northPanel.add(locationLabel);
locationLabel.setMinimumSize(new Dimension(0, 0)); northPanel.add(trackingLabel, BorderLayout.EAST);
northPanel.add(Box.createGlue());
northPanel.add(trackingLabel);
this.setNorthComponent(northPanel); this.setNorthComponent(northPanel);
if (isConnected) { if (isConnected) {
setTitle(DebuggerResources.TITLE_PROVIDER_LISTING); 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; package ghidra.app.plugin.core.debug.gui.memory;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodHandles;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.*; import java.util.*;
import javax.swing.*; import javax.swing.JLabel;
import javax.swing.JPanel;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -207,11 +207,9 @@ public class DebuggerMemoryBytesProvider extends ProgramByteViewerComponentProvi
createActions(); createActions();
addDisplayListener(readsMemTrait.getDisplayListener()); addDisplayListener(readsMemTrait.getDisplayListener());
Box northPanel = Box.createHorizontalBox(); JPanel northPanel = new JPanel(new BorderLayout());
northPanel.add(locationLabel); northPanel.add(locationLabel);
locationLabel.setMinimumSize(new Dimension(0, 0)); northPanel.add(trackingLabel, BorderLayout.EAST);
northPanel.add(Box.createGlue());
northPanel.add(trackingLabel);
decorationComponent.add(northPanel, BorderLayout.NORTH); decorationComponent.add(northPanel, BorderLayout.NORTH);
goToTrait.goToCoordinates(current); goToTrait.goToCoordinates(current);