From 4300bec3823644dbe31132bfacef687f852c18d8 Mon Sep 17 00:00:00 2001
From: dragonmacher <48328597+dragonmacher@users.noreply.github.com>
Date: Tue, 24 Nov 2020 14:18:24 -0500
Subject: [PATCH] Fixed slightly broken animation option referenced in #2519

---
 .../src/main/java/docking/DockableHeader.java      |  4 ++++
 .../src/main/java/docking/GenericHeader.java       | 14 ++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Ghidra/Framework/Docking/src/main/java/docking/DockableHeader.java b/Ghidra/Framework/Docking/src/main/java/docking/DockableHeader.java
index 335d7abb5f..0ede2ee5ca 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/DockableHeader.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/DockableHeader.java
@@ -167,6 +167,10 @@ public class DockableHeader extends GenericHeader
 
 	private Animator emphasizeDockableComponent() {
 
+		if (!AnimationUtils.isAnimationEnabled()) {
+			return null;
+		}
+
 		ComponentPlaceholder placeholder = dockComp.getComponentWindowingPlaceholder();
 		ComponentNode node = placeholder.getNode();
 		WindowNode windowNode = node.getTopLevelNode();
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/GenericHeader.java b/Ghidra/Framework/Docking/src/main/java/docking/GenericHeader.java
index 7ec1df35b6..ab224f95fb 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/GenericHeader.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/GenericHeader.java
@@ -26,6 +26,7 @@ import org.jdesktop.animation.timing.TimingTargetAdapter;
 import org.jdesktop.animation.timing.interpolation.PropertySetter;
 
 import docking.action.DockingActionIf;
+import docking.util.AnimationUtils;
 import docking.widgets.VariableHeightPanel;
 import docking.widgets.label.GDLabel;
 
@@ -100,6 +101,7 @@ public class GenericHeader extends JPanel {
 	/**
 	 * Signals whether or not to break the toolbar actions into multiple rows.  The default is
 	 * to wrap as necessary.  
+	 * @param noWrap true signals not to break the actions into multiple rows
 	 */
 	public void setNoWrapToolbar(boolean noWrap) {
 		useSingleLineLayoutOverride = noWrap;
@@ -254,6 +256,10 @@ public class GenericHeader extends JPanel {
 	}
 
 	protected Animator createEmphasizingAnimator() {
+		if (!AnimationUtils.isAnimationEnabled()) {
+			return null;
+		}
+
 		TitleFlasher titleFlasher = new TitleFlasher();
 		return titleFlasher.animator;
 	}
@@ -262,10 +268,6 @@ public class GenericHeader extends JPanel {
 		return titlePanel.isSelected();
 	}
 
-	/**
-	 * Sets the title displayed within the header
-	 * @param title
-	 */
 	public void setTitle(String title) {
 		titlePanel.setTitle(title);
 	}
@@ -389,10 +391,6 @@ public class GenericHeader extends JPanel {
 			titleLabel.setToolTipText(s);
 		}
 
-		/**
-		 * Sets the Icon for this header
-		 * @param icon
-		 */
 		void setIcon(Icon icon) {
 
 			icon = DockingUtils.scaleIconAsNeeded(icon);