Merge remote-tracking branch 'origin/GT-0_ghidravore_updating_fit_to_window_icon' into Ghidra_9.2

This commit is contained in:
ghidravore 2020-11-05 14:29:26 -05:00
commit 8dbe86bfbc
5 changed files with 5 additions and 2 deletions

View file

@ -5,6 +5,7 @@
##MODULE IP: LGPL 2.1 ##MODULE IP: LGPL 2.1
##MODULE IP: MIT ##MODULE IP: MIT
##MODULE IP: Oxygen Icons - LGPL 3.0 ##MODULE IP: Oxygen Icons - LGPL 3.0
##MODULE IP: Tango Icons - Public Domain
Module.manifest||GHIDRA||||END| Module.manifest||GHIDRA||||END|
build.gradle||GHIDRA||||END| build.gradle||GHIDRA||||END|
src/main/help/help/TOC_Source.xml||GHIDRA||||END| src/main/help/help/TOC_Source.xml||GHIDRA||||END|
@ -21,4 +22,5 @@ src/main/resources/images/project-open.png||Oxygen Icons - LGPL 3.0|||Oxygen ico
src/main/resources/images/redspheregraph.png||GHIDRA||||END| src/main/resources/images/redspheregraph.png||GHIDRA||||END|
src/main/resources/images/sat2.png||GHIDRA||||END| src/main/resources/images/sat2.png||GHIDRA||||END|
src/main/resources/images/tree.png||GHIDRA||||END| src/main/resources/images/tree.png||GHIDRA||||END|
src/main/resources/images/view-fullscreen.png||Tango Icons - Public Domain|||tango icon set|END|
src/main/resources/jungrapht.properties||GHIDRA||||END| src/main/resources/jungrapht.properties||GHIDRA||||END|

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Before After
Before After

View file

@ -33,5 +33,6 @@ final class DefaultDisplayGraphIcons {
public static final Icon LAYOUT_ALGORITHM_ICON = Icons.get("images/katomic.png"); public static final Icon LAYOUT_ALGORITHM_ICON = Icons.get("images/katomic.png");
public static final Icon LASSO_ICON = Icons.get("images/Lasso.png"); public static final Icon LASSO_ICON = Icons.get("images/Lasso.png");
public static final Icon FILTER_ICON = Icons.CONFIGURE_FILTER_ICON; public static final Icon FILTER_ICON = Icons.CONFIGURE_FILTER_ICON;
public static final Icon FIT_TO_WINDOW = Icons.get("images/view-fullscreen.png");
} }

View file

@ -304,8 +304,8 @@ public class DefaultGraphDisplay implements GraphDisplay {
// create an icon button to reset the view transformations to identity (scaled to layout) // create an icon button to reset the view transformations to identity (scaled to layout)
new ActionBuilder("Reset View", ACTION_OWNER) new ActionBuilder("Reset View", ACTION_OWNER)
.description("Reset all view transforms to center graph in display") .description("Fit Graph to Window")
.toolBarIcon(Icons.REFRESH_ICON) .toolBarIcon(DefaultDisplayGraphIcons.FIT_TO_WINDOW)
.onAction(context -> viewer.scaleToLayout()) .onAction(context -> viewer.scaleToLayout())
.buildAndInstallLocal(componentProvider); .buildAndInstallLocal(componentProvider);

Binary file not shown.

After

Width:  |  Height:  |  Size: 650 B