From 463958067b2f49ccdbb32046ebd4620c4b10d195 Mon Sep 17 00:00:00 2001 From: "ghidramonster ghidramonster@localhost" Date: Thu, 13 Oct 2022 12:38:40 -0400 Subject: [PATCH] GP-2057: Tool Chest Buttons needs Accessible Text --- .../ghidra/framework/main/ToolButton.java | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/ToolButton.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/ToolButton.java index 1fb96282cc..8cec2d9866 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/ToolButton.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/ToolButton.java @@ -18,7 +18,8 @@ package ghidra.framework.main; import java.awt.*; import java.awt.datatransfer.*; import java.awt.dnd.*; -import java.awt.event.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import java.io.IOException; import java.util.List; @@ -98,6 +99,7 @@ class ToolButton extends EmptyBorderButton implements Draggable, Droppable { associatedRunningTool = tool; this.template = template; setUpDragDrop(); + setToolTipText(generateToolTipText()); // configure the look and feel of the button setVerticalTextPosition(SwingConstants.BOTTOM); @@ -133,15 +135,11 @@ class ToolButton extends EmptyBorderButton implements Draggable, Droppable { } } - /** - * Get the tool tip text. - */ - @Override - public String getToolTipText(MouseEvent event) { + private String generateToolTipText() { if (associatedRunningTool != null) { if (associatedRunningTool instanceof PluginTool) { - return "" + HTMLUtilities.escapeHTML( - ((PluginTool) associatedRunningTool).getToolFrame().getTitle()); + return "" + + HTMLUtilities.escapeHTML(associatedRunningTool.getToolFrame().getTitle()); } return "" + HTMLUtilities.escapeHTML(associatedRunningTool.getName()); @@ -180,13 +178,13 @@ class ToolButton extends EmptyBorderButton implements Draggable, Droppable { try { for (DataFlavor element : flavors) { if (element.equals(DataTreeDragNDropHandler.localDomainFileFlavor)) { - Object draggedData = e.getTransferable().getTransferData( - DataTreeDragNDropHandler.localDomainFileFlavor); + Object draggedData = e.getTransferable() + .getTransferData(DataTreeDragNDropHandler.localDomainFileFlavor); return containsSupportedDataTypes((List) draggedData); } else if (element.equals(ToolButtonTransferable.localToolButtonFlavor)) { - Object draggedData = e.getTransferable().getTransferData( - ToolButtonTransferable.localToolButtonFlavor); + Object draggedData = e.getTransferable() + .getTransferData(ToolButtonTransferable.localToolButtonFlavor); ToolButton draggedButton = (ToolButton) draggedData; if (draggedButton != null) { if (draggedButton.associatedRunningTool == associatedRunningTool) {