Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2020-06-09 06:05:11 +0000
committerAlexander Kurtakov2020-06-09 06:47:03 +0000
commit98ac97d26298e371fe1e928c79672be5875e2914 (patch)
tree7f2be83d3f14a06a3d125dda15deeee51c2401fb /org.eclipse.ui.intro
parent1159ebdcf3929e77000197f0ec34d551c6fde855 (diff)
downloadeclipse.platform.ua-98ac97d26298e371fe1e928c79672be5875e2914.tar.gz
eclipse.platform.ua-98ac97d26298e371fe1e928c79672be5875e2914.tar.xz
eclipse.platform.ua-98ac97d26298e371fe1e928c79672be5875e2914.zip
Bug 563471 - Remove animation code from platform
Cleanup platform.ua from animation usages. Change-Id: I01127d5f7acf2e2f73607a9ad38451d510d45b4a Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Diffstat (limited to 'org.eclipse.ui.intro')
-rw-r--r--org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/url/IntroURL.java15
-rw-r--r--org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/presentations/IntroLaunchBar.java9
2 files changed, 2 insertions, 22 deletions
diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/url/IntroURL.java b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/url/IntroURL.java
index eb08cf8ef..b97240d10 100644
--- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/url/IntroURL.java
+++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/url/IntroURL.java
@@ -21,10 +21,8 @@ import org.eclipse.core.commands.ParameterizedCommand;
import org.eclipse.core.commands.common.CommandException;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.util.Geometry;
import org.eclipse.swt.browser.Browser;
import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IActionDelegate;
import org.eclipse.ui.IWorkbench;
@@ -33,7 +31,6 @@ import org.eclipse.ui.IWorkbenchWindowActionDelegate;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.commands.ICommandService;
import org.eclipse.ui.handlers.IHandlerService;
-import org.eclipse.ui.internal.AnimationEngine;
import org.eclipse.ui.internal.intro.impl.IIntroConstants;
import org.eclipse.ui.internal.intro.impl.IntroPlugin;
import org.eclipse.ui.internal.intro.impl.Messages;
@@ -642,30 +639,22 @@ public class IntroURL implements IIntroURL {
private boolean switchToLaunchBar() {
- IIntroPart intro = PlatformUI.getWorkbench().getIntroManager()
- .getIntro();
+ IIntroPart intro = PlatformUI.getWorkbench().getIntroManager().getIntro();
if (intro == null)
return false;
- CustomizableIntroPart cpart = (CustomizableIntroPart) intro;
IntroModelRoot modelRoot = IntroPlugin.getDefault().getIntroModelRoot();
- Rectangle bounds = cpart.getControl().getBounds();
- Rectangle startBounds = Geometry.toDisplay(cpart.getControl()
- .getParent(), bounds);
IntroLaunchBarElement launchBarElement = modelRoot.getPresentation().getLaunchBarElement();
if (launchBarElement == null)
return true;
IWorkbenchWindow window = intro.getIntroSite().getWorkbenchWindow();
- IntroLaunchBar launchBar = IntroLaunchBar.create(window, modelRoot, launchBarElement);
+ IntroLaunchBar.create(window, modelRoot, launchBarElement);
PlatformUI.getWorkbench().getIntroManager().setIntroStandby(intro, true);
closeIntro();
- Rectangle endBounds = Geometry.toDisplay(launchBar.getControl()
- .getParent(), launchBar.getControl().getBounds());
- AnimationEngine.createTweakedAnimation(window.getShell(), 400, startBounds, endBounds);
return true;
}
}
diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/presentations/IntroLaunchBar.java b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/presentations/IntroLaunchBar.java
index 61de1bd88..3a2f9efb3 100644
--- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/presentations/IntroLaunchBar.java
+++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/presentations/IntroLaunchBar.java
@@ -37,7 +37,6 @@ import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.Separator;
import org.eclipse.jface.action.ToolBarManager;
import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.util.Geometry;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Point;
@@ -52,7 +51,6 @@ import org.eclipse.swt.widgets.ToolBar;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.internal.AnimationEngine;
import org.eclipse.ui.internal.intro.impl.IntroPlugin;
import org.eclipse.ui.internal.intro.impl.Messages;
import org.eclipse.ui.internal.intro.impl.model.IntroLaunchBarElement;
@@ -62,7 +60,6 @@ import org.eclipse.ui.internal.intro.impl.model.IntroTheme;
import org.eclipse.ui.internal.intro.impl.swt.SharedStyleManager;
import org.eclipse.ui.internal.intro.impl.util.ImageUtil;
import org.eclipse.ui.intro.IIntroPart;
-import org.eclipse.ui.intro.config.CustomizableIntroPart;
import org.eclipse.ui.intro.config.IIntroURL;
import org.eclipse.ui.intro.config.IntroURLFactory;
@@ -453,12 +450,6 @@ public class IntroLaunchBar {
if (restore) {
IWorkbenchWindow window = getWorkbenchWindow();
intro = PlatformUI.getWorkbench().getIntroManager().showIntro(window, false);
- CustomizableIntroPart cpart = (CustomizableIntroPart) intro;
- Rectangle startBounds = Geometry.toDisplay(getControl().getParent(), getControl().getBounds());
- Rectangle endBounds = Geometry.toDisplay(cpart.getControl().getParent(), cpart.getControl()
- .getBounds());
-
- AnimationEngine.createTweakedAnimation(window.getShell(), 400, startBounds, endBounds);
}
dispose();
return intro;

Back to the top