Attachment #180959 for bug #327893

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

View | Details | Raw Unified | Return to bug 327893
Collapse All | Expand All

Lines 14-22 Link Here

(-)src/org/eclipse/e4/ui/workbench/addons/dndaddon/CursorInfo.java (+2 lines)
14	import org.eclipse.e4.ui.model.application.ui.advanced.MPlaceholder;	14	import org.eclipse.e4.ui.model.application.ui.advanced.MPlaceholder;
15	import org.eclipse.swt.graphics.Point;	15	import org.eclipse.swt.graphics.Point;
16	import org.eclipse.swt.graphics.Rectangle;	16	import org.eclipse.swt.graphics.Rectangle;
		17	import org.eclipse.swt.widgets.Control;
17		18
18	class CursorInfo {	19	class CursorInfo {
19	Point cursorPos;	20	Point cursorPos;
		21	Control curCtrl;
20	MUIElement curElement;	22	MUIElement curElement;
21	MPlaceholder curElementRef;	23	MPlaceholder curElementRef;
22	MUIElement itemElement;	24	MUIElement itemElement;

Lines 124-130 Link Here

(-)src/org/eclipse/e4/ui/workbench/addons/dndaddon/DnDManager.java (+4 lines)
124	baseWindow = window;	124	baseWindow = window;
125		125
126	dragAgents.add(new PartDragAgent());	126	dragAgents.add(new PartDragAgent());
		127	dragAgents.add(new ToolbarDragAgent());
127	dropAgents.add(new StackDropAgent(window));	128	dropAgents.add(new StackDropAgent(window));
		129	dropAgents.add(new ToolbarDropAgent());
128		130
129	modelService = (EModelService) window.getContext().get(EModelService.class.getName());	131	modelService = (EModelService) window.getContext().get(EModelService.class.getName());
130	dropAgents.add(new SplitDropAgent(modelService));	132	dropAgents.add(new SplitDropAgent(modelService));
Lines 189-194 Link Here
189	baseShell.setCapture(true);	191	baseShell.setCapture(true);
190		192
191	try {	193	try {
		194	dragAgent.dragStart(dragAgent.dragElement);
		195
192	// Run tracker until mouse up occurs or escape key pressed.	196	// Run tracker until mouse up occurs or escape key pressed.
193	boolean performDrop = tracker.open();	197	boolean performDrop = tracker.open();
194		198

Lines 109-115 Link Here

(-)src/org/eclipse/e4/ui/workbench/addons/dndaddon/DragAgent.java (-1 lines)
109	* semi-transparent window that will track with the cursor.	109	* semi-transparent window that will track with the cursor.
110	*/	110	*/
111	public void createDragFeedback() {	111	public void createDragFeedback() {
112	dragHost = new DragHost(dragElement);
113	}	112	}
114		113
115	/**	114	/**




	public CursorInfo getCursorInfo() {
		CursorInfo info = new CursorInfo();
		info.cursorPos = display.getCursorLocation();
		info.curCtrl = display.getCursorControl();
		if (info.curCtrl == null) {
			return info;
		}

		MUIElement curElement = getModelElement(info.curCtrl);
		if (curElement instanceof MPlaceholder) {
			info.curElement = ((MPlaceholder) curElement).getRef();
			info.curElementRef = (MPlaceholder) curElement;

Lines 43-48 Link Here

(-)src/org/eclipse/e4/ui/workbench/addons/dndaddon/StackDropAgent.java (+3 lines)
43		43
44	@Override	44	@Override
45	public boolean canDrop(MUIElement dragElement, CursorInfo info) {	45	public boolean canDrop(MUIElement dragElement, CursorInfo info) {
		46	if (!(dragElement instanceof MPart))
		47	return false;
		48
46	if (info.curElement == dragElement.getParent()) {	49	if (info.curElement == dragElement.getParent()) {
47	if (info.curElement != null && info.curElement == dragElement.getParent()) {	50	if (info.curElement != null && info.curElement == dragElement.getParent()) {
48	CTabFolder ctf = (CTabFolder) dragElement.getParent().getWidget();	51	CTabFolder ctf = (CTabFolder) dragElement.getParent().getWidget();




/*******************************************************************************
 * Copyright (c) 2010 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 ******************************************************************************/

package org.eclipse.e4.ui.workbench.addons.dndaddon;

import org.eclipse.e4.ui.model.application.ui.MUIElement;
import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
import org.eclipse.swt.widgets.ToolBar;

/**
 *
 */
public class ToolbarDragAgent extends DragAgent {

	@Override
	public MUIElement getElementToDrag(CursorInfo info) {
		if (info.curElement instanceof MToolBar) {
			if (info.curCtrl instanceof ToolBar) {
				if (info.curCtrl == info.curCtrl.getParent().getChildren()[0]) {
					dragElement = info.curElement;
					return info.curElement;
				}
			}
		}
		return null;
	}

	@Override
	public void dragStart(MUIElement element) {
		super.dragStart(element);

		element.setVisible(false);
	}
}




/*******************************************************************************
 * Copyright (c) 2010 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 ******************************************************************************/

package org.eclipse.e4.ui.workbench.addons.dndaddon;

import org.eclipse.e4.ui.model.application.ui.MUIElement;
import org.eclipse.e4.ui.model.application.ui.SideValue;
import org.eclipse.e4.ui.model.application.ui.basic.MTrimBar;
import org.eclipse.e4.ui.model.application.ui.basic.MTrimElement;
import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.graphics.Cursor;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;

/**
 *
 */
public class ToolbarDropAgent extends DropAgent {
	private Shell dragShell;

	public ToolbarDropAgent() {
	}

	@Override
	public boolean canDrop(MUIElement dragElement, CursorInfo info) {
		if (!(dragElement instanceof MToolBar) || info.curElement == null)
			return false;

		// We can only drop TB's onto a trim area
		if (info.curElement instanceof MTrimBar)
			return true;

		MUIElement parentElement = info.curElement.getParent();
		if (parentElement instanceof MTrimBar)
			return true;

		return false;
	}

	@Override
	public boolean drop(MUIElement dragElement, CursorInfo info) {
		MTrimBar theBar = (MTrimBar) ((info.curElement instanceof MTrimBar) ? info.curElement
				: info.curElement.getParent());

		// If we're over another trim element should we go before or after it ?
		int index = -1;
		if (info.curElement != theBar) {
			index = info.curElement.getParent().getChildren().indexOf(info.curElement);
			if (after(info))
				index++;
		}

		dragElement.getParent().getChildren().remove(dragElement);
		dragElement.setVisible(true);
		if (index == -1 || index > theBar.getChildren().size() - 1)
			theBar.getChildren().add((MTrimElement) dragElement);
		else
			theBar.getChildren().add(index, (MTrimElement) dragElement);

		if (dragShell != null)
			dragShell.dispose();

		return true;
	}

	private boolean after(CursorInfo info) {
		if (info.curElement instanceof MTrimBar)
			return false;

		MTrimBar theBar = (MTrimBar) ((MUIElement) info.curElement.getParent());
		boolean isHorizontal = theBar.getSide() == SideValue.TOP
				|| theBar.getSide() == SideValue.BOTTOM;

		MUIElement overElement = info.curElement;
		Control ctrl = (Control) overElement.getWidget();
		Rectangle bounds = ctrl.getBounds();
		bounds = ctrl.getDisplay().map(ctrl.getParent(), null, bounds);

		if (isHorizontal
				&& info.cursorPos.x - bounds.x >= (bounds.x + bounds.width) - info.cursorPos.x)
			return true;
		else if (!isHorizontal
				&& info.cursorPos.y - bounds.y >= (bounds.y + bounds.height) - info.cursorPos.y)
			return true;

		return false;
	}

	@Override
	public Rectangle getRectangle(MUIElement dragElement, CursorInfo info) {
		boolean needsOpen = false;
		if (dragShell == null) {
			dragShell = new Shell(SWT.NO_TRIM);
			dragShell.setAlpha(150);
			dragShell.setLayout(new FillLayout());

			Composite comp = new Composite(dragShell, SWT.BORDER);
			comp.setLayout(new FillLayout());

			dragShell.addDisposeListener(new DisposeListener() {
				public void widgetDisposed(DisposeEvent e) {
					dragShell = null;
				}
			});
			Control ctrl = (Control) dragElement.getWidget();
			ctrl.setParent(comp);
			dragShell.pack();
			needsOpen = true;
		}

		Point newLoc = new Point(info.cursorPos.x + 4, info.cursorPos.y + 4);
		dragShell.setLocation(newLoc);

		if (needsOpen)
			dragShell.open();

		MUIElement overElement = info.curElement;
		Control ctrl = (Control) overElement.getWidget();
		Rectangle bounds = ctrl.getBounds();
		bounds = ctrl.getDisplay().map(ctrl.getParent(), null, bounds);
		bounds.x = after(info) ? bounds.x + bounds.width : bounds.x;
		bounds.width = 5;
		bounds.x -= bounds.width / 2;

		return bounds;
	}

	@Override
	public Cursor getCursor(Display display, MUIElement dragElement, CursorInfo info) {
		return display.getSystemCursor(SWT.CURSOR_HAND);
	}
}

Return to bug 327893

Lines 29-40 Link Here

(-)src/org/eclipse/e4/ui/workbench/addons/dndaddon/DragAndDropUtil.java (-3 / +3 lines)
29	public CursorInfo getCursorInfo() {	29	public CursorInfo getCursorInfo() {
30	CursorInfo info = new CursorInfo();	30	CursorInfo info = new CursorInfo();
31	info.cursorPos = display.getCursorLocation();	31	info.cursorPos = display.getCursorLocation();
32	Control curControl = display.getCursorControl();	32	info.curCtrl = display.getCursorControl();
33	if (curControl == null) {	33	if (info.curCtrl == null) {
34	return info;	34	return info;
35	}	35	}
36		36
37	MUIElement curElement = getModelElement(curControl);	37	MUIElement curElement = getModelElement(info.curCtrl);
38	if (curElement instanceof MPlaceholder) {	38	if (curElement instanceof MPlaceholder) {
39	info.curElement = ((MPlaceholder) curElement).getRef();	39	info.curElement = ((MPlaceholder) curElement).getRef();
40	info.curElementRef = (MPlaceholder) curElement;	40	info.curElementRef = (MPlaceholder) curElement;

Added Link Here

(-)src/org/eclipse/e4/ui/workbench/addons/dndaddon/ToolbarDragAgent.java (+42 lines)
1	/*******************************************************************************
2	* Copyright (c) 2010 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	******************************************************************************/
11
12	package org.eclipse.e4.ui.workbench.addons.dndaddon;
13
14	import org.eclipse.e4.ui.model.application.ui.MUIElement;
15	import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
16	import org.eclipse.swt.widgets.ToolBar;
17
18	/**
19	*
20	*/
21	public class ToolbarDragAgent extends DragAgent {
22
23	@Override
24	public MUIElement getElementToDrag(CursorInfo info) {
25	if (info.curElement instanceof MToolBar) {
26	if (info.curCtrl instanceof ToolBar) {
27	if (info.curCtrl == info.curCtrl.getParent().getChildren()[0]) {
28	dragElement = info.curElement;
29	return info.curElement;
30	}
31	}
32	}
33	return null;
34	}
35
36	@Override
37	public void dragStart(MUIElement element) {
38	super.dragStart(element);
39
40	element.setVisible(false);
41	}
42	}