Fixed slightly broken animation option referenced in #2519

This commit is contained in:
dragonmacher
2020-11-24 14:18:24 -05:00
parent babfb7b326
commit 4300bec382
2 changed files with 10 additions and 8 deletions

View File

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

View File

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