Andreas Mülder пре 14 година
родитељ
комит
4503075500

+ 2 - 2
plugins/org.yakindu.sct.ui.editor/src/org/yakindu/sct/ui/editor/editor/StatechartDiagramActionbarContributor.java

@@ -15,8 +15,8 @@ import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramActionBarContributor;
 import org.eclipse.ui.IActionBars;
 /**
  * 
- * @author Andreas Muelder <a href="mailto:andreas.muelder@itemis.de">andreas.muelder@itemis.de</a>
-*
+ * @author andreas muelder - Initial contribution and API
+ *
  */
 public class StatechartDiagramActionbarContributor extends
 		DiagramActionBarContributor {

+ 0 - 1
plugins/org.yakindu.sct.ui.editor/src/org/yakindu/sct/ui/editor/editor/figures/ShallowHistoryFigure.java

@@ -10,7 +10,6 @@
  */
 package org.yakindu.sct.ui.editor.editor.figures;
 
-import org.eclipse.draw2d.ColorConstants;
 import org.eclipse.draw2d.Ellipse;
 import org.eclipse.draw2d.Graphics;
 import org.eclipse.draw2d.geometry.Dimension;

+ 2 - 2
plugins/org.yakindu.sct.ui.editor/src/org/yakindu/sct/ui/editor/providers/StatechartDiagramEditPartProvider.java

@@ -17,13 +17,13 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.services.editpart.AbstractEditPartProvider;
 import org.eclipse.gmf.runtime.notation.View;
 import org.yakindu.sct.ui.editor.editor.StatechartDiagramEditor;
-import org.yakindu.sct.ui.editor.editparts.ChoiceEditPart;
 import org.yakindu.sct.ui.editor.editparts.BorderItemEditPart;
+import org.yakindu.sct.ui.editor.editparts.ChoiceEditPart;
 import org.yakindu.sct.ui.editor.editparts.EntryEditPart;
-import org.yakindu.sct.ui.editor.editparts.NamedElementLabelEditPart;
 import org.yakindu.sct.ui.editor.editparts.ExitEditPart;
 import org.yakindu.sct.ui.editor.editparts.FinalStateEditPart;
 import org.yakindu.sct.ui.editor.editparts.JunctionEditPart;
+import org.yakindu.sct.ui.editor.editparts.NamedElementLabelEditPart;
 import org.yakindu.sct.ui.editor.editparts.RegionCompartmentEditPart;
 import org.yakindu.sct.ui.editor.editparts.RegionEditPart;
 import org.yakindu.sct.ui.editor.editparts.RegionNameEditPart;

+ 1 - 1
plugins/org.yakindu.sct.ui.editor/src/org/yakindu/sct/ui/editor/providers/StatechartDiagramViewProvider.java

@@ -20,8 +20,8 @@ import org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.CompartmentView
 import org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.ShapeViewFactory;
 import org.eclipse.gmf.runtime.notation.View;
 import org.yakindu.sct.ui.editor.editor.StatechartDiagramEditor;
-import org.yakindu.sct.ui.editor.factories.BorderItemLabelViewFactory;
 import org.yakindu.sct.ui.editor.factories.BorderItemContainerViewFactory;
+import org.yakindu.sct.ui.editor.factories.BorderItemLabelViewFactory;
 import org.yakindu.sct.ui.editor.factories.RegionViewFactory;
 import org.yakindu.sct.ui.editor.factories.StateTextCompartmentViewFactory;
 import org.yakindu.sct.ui.editor.factories.StateViewFactory;

+ 9 - 3
plugins/org.yakindu.sct.ui.editor/src/org/yakindu/sct/ui/editor/submachine/SubStateDecorator.java

@@ -1,6 +1,8 @@
 package org.yakindu.sct.ui.editor.submachine;
 
 import org.eclipse.core.runtime.Assert;
+import org.eclipse.draw2d.ColorConstants;
+import org.eclipse.draw2d.GhostImageFigure;
 import org.eclipse.draw2d.ImageFigure;
 import org.eclipse.draw2d.MouseEvent;
 import org.eclipse.draw2d.MouseListener;
@@ -91,14 +93,18 @@ public abstract class SubStateDecorator extends BaseDecorator {
 			}
 
 			public void mouseEntered(MouseEvent me) {
-				decoration.setToolTip(new ImageFigure());
 				Diagram diagram = getTooltipDiagramToRender(semanticElement);
 				if (diagram != null) {
 					Image renderImage = renderImage(diagram);
-					ImageFigure toolTip = (ImageFigure) decoration.getToolTip();
+					ImageFigure toolTip = new ImageFigure(renderImage);
+					System.out.println("Image bounds " + renderImage.getBounds());
+					toolTip.setSize(renderImage.getBounds().width, renderImage.getBounds().height);
+					System.out.println("Tooltip bounds " + toolTip.getBounds());
+					GhostImageFigure ghost = new GhostImageFigure(toolTip, 80, ColorConstants.white.getRGB());
 					if (toolTip.getImage() != null)
 						toolTip.getImage().dispose();
-					toolTip.setImage(renderImage);
+					ghost.setSize(toolTip.getSize().getCopy());
+					decoration.setToolTip(ghost);
 				}
 			}