Attachment #7556 for bug #13585

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

Lines 11-21 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/DetachedWindow.java (-11 / +29 lines)
11		11
12	package org.eclipse.ui.internal;	12	package org.eclipse.ui.internal;
13		13
		14	import java.util.ArrayList;
14	import java.util.Enumeration;	15	import java.util.Enumeration;
		16	import java.util.Iterator;
15	import java.util.List;	17	import java.util.List;
16	import java.util.Vector;	18	import java.util.Vector;
17		19
18	import org.eclipse.jface.window.Window;
19	import org.eclipse.swt.SWT;	20	import org.eclipse.swt.SWT;
20	import org.eclipse.swt.custom.CTabFolder2;	21	import org.eclipse.swt.custom.CTabFolder2;
21	import org.eclipse.swt.graphics.Rectangle;	22	import org.eclipse.swt.graphics.Rectangle;
Lines 24-29 Link Here
24	import org.eclipse.swt.widgets.Event;	25	import org.eclipse.swt.widgets.Event;
25	import org.eclipse.swt.widgets.Listener;	26	import org.eclipse.swt.widgets.Listener;
26	import org.eclipse.swt.widgets.Shell;	27	import org.eclipse.swt.widgets.Shell;
		28
		29	import org.eclipse.jface.window.Window;
		30
27	import org.eclipse.ui.IMemento;	31	import org.eclipse.ui.IMemento;
28	import org.eclipse.ui.IWorkbenchPage;	32	import org.eclipse.ui.IWorkbenchPage;
29	import org.eclipse.ui.help.WorkbenchHelp;	33	import org.eclipse.ui.help.WorkbenchHelp;
Lines 41-48 Link Here
41	*/	45	*/
42	public DetachedWindow(WorkbenchPage workbenchPage) {	46	public DetachedWindow(WorkbenchPage workbenchPage) {
43	super(workbenchPage.getWorkbenchWindow().getShell());	47	super(workbenchPage.getWorkbenchWindow().getShell());
44	setShellStyle(/* SWT.CLOSE \| SWT.MIN \| SWT.MAX \| */	48	setShellStyle( //SWT.CLOSE \| SWT.MIN \| SWT.MAX \|
45	SWT.RESIZE);	49	SWT.RESIZE );
46	this.page = workbenchPage;	50	this.page = workbenchPage;
47	folder = new PartTabFolder();	51	folder = new PartTabFolder();
48	}	52	}
Lines 138-152 Link Here
138	* Close has been pressed. Close all views.	142	* Close has been pressed. Close all views.
139	*/	143	*/
140	protected void handleShellCloseEvent() {	144	protected void handleShellCloseEvent() {
141	// List views = new ArrayList();	145	List views = new ArrayList();
142	// collectViewPanes(views, getChildren());	146	collectViewPanes(views, getChildren());
143	// Iterator enum = views.iterator();	147	Iterator enum = views.iterator();
144	// while (enum.hasNext()) {	148	while (enum.hasNext()) {
145	// ViewPane child = (ViewPane)enum.next();	149	ViewPane child = (ViewPane)enum.next();
146	// page.hideView(child.getViewPart());	150	page.hideView(child.getViewReference());
147	// }	151	}
148	// close();	152	close();
149	}	153	}
		154
150	protected void initializeBounds() {	155	protected void initializeBounds() {
151	if (bounds != null)	156	if (bounds != null)
152	getShell().setBounds(bounds);	157	getShell().setBounds(bounds);
Lines 212-215 Link Here
212	return folder.getControl();	217	return folder.getControl();
213	}	218	}
214		219
		220	/* (non-Javadoc)
		221	* @see org.eclipse.jface.window.Window#getConstrainedShellSize(org.eclipse.swt.graphics.Rectangle)
		222	*/
		223	protected Rectangle getConstrainedShellSize(Rectangle preferredSize) {
		224	Rectangle displayBounds = getShell().getDisplay().getBounds();
		225
		226	// As long as the initial position is somewhere on the display, don't mess with it.
		227	if (displayBounds.intersects(preferredSize)) {
		228	return preferredSize;
		229	}
		230
		231	return super.getConstrainedShellSize(preferredSize);
		232	}
215	}	233	}




	}

	/**
	 * Answer a list of the view panes.
	 */
	private DetachedWindow[] collectDetachedWindows(Window[] windows) {
		DetachedWindow[] result = new DetachedWindow[0];
		for (int i = 0, length = windows.length; i < length; i++) {
			if (windows[i] instanceof DetachedWindow
				&& ((DetachedWindow) windows[i]).belongsToWorkbenchPage(page)) {
				DetachedWindow[] newResult =
					new DetachedWindow[result.length + 1];
				System.arraycopy(result, 0, newResult, 0, result.length);
				newResult[result.length] = (DetachedWindow) windows[i];
				result = newResult;
			}
		}
		return result;
	}

	/**
	 * Open the tracker to allow the user to move the specified part using
	 * keyboard.
	 */

		DragUtil.performDrag(pane, DragUtil.getDisplayBounds(pane.getControl()));
	}
	/**
	 * Answer a list of the view panes.
	 */
	private void collectDragParts(List result, LayoutPart[] parts) {
		for (int i = 0, length = parts.length; i < length; i++) {
			LayoutPart part = parts[i];
			if (part instanceof ViewPane) {
				result.add(part);
			} else if (part instanceof ILayoutContainer) {
				collectDragParts(
					result,
					((ILayoutContainer) part).getChildren());
			}
		}
	}

	/**
	 * Answer a list of the PartPlaceholder objects.
	 */
	private PartPlaceholder[] collectPlaceholders() {

		disableAllDrag();

		// Reparent all views to the main window
		Composite parent = mainLayout.getParent();
		Vector children = new Vector();
		collectViewPanes(children, mainLayout.getChildren());


		ILayoutContainer oldContainer = part.getContainer();

		// Reparent the part back to the main window
		part.reparent(mainLayout.getParent());

		// Update container.
		if (oldContainer == null)

		} else if (newContainer instanceof PartTabFolder) {
			// move this part relative to the folder
			// rather than relative to the part in the folder
			movePart(part, position, newContainer);
		}
	}
	/**

		// If drop target is not registered object then reject.
		if (e.dropTarget == null
			&& e.relativePosition != DragCursors.OFFSCREEN) {
			e.relativePosition = DragCursors.INVALID;
			//e.dropTarget = null;
			//e.relativePosition = offScreenPosition;
			return;
		}

		// If drop target is not over view, or tab folder, reject.
		if (!(e.dropTarget instanceof ViewPane
			|| e.dropTarget instanceof PartTabFolder)) {
			//e.relativePosition = DragCursors.INVALID;
			e.dropTarget = null;
			e.relativePosition = offScreenPosition;
			return;


		// If drag source is view ..
		if (e.dragSource instanceof ViewPane) {
			// If target is detached window force stacking.
			Window window = e.dropTarget.getWindow();
			if (window instanceof DetachedWindow) {
				//e.relativePosition = DragCursors.CENTER;
				e.relativePosition = offScreenPosition;
				return;
			}
			
			if (e.dragSource == e.dropTarget) {
				// Reject stack onto same view
				if (e.relativePosition == DragCursors.CENTER) {

					e.relativePosition = DragCursors.INVALID;
					return;
				}
			}

			// If target is detached window force stacking.
			Window window = e.dropTarget.getWindow();
			if (window instanceof DetachedWindow) {
				e.relativePosition = DragCursors.CENTER;
				return;
			}

			// All seems well

Lines 192-203 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/dnd/CompatibilityDragTarget.java (-5 / +3 lines)
192		192
193	PartDropEvent dropEvent = createDropEvent(currentControl, position, source, new Point(dragRectangle.x, dragRectangle.y));	193	PartDropEvent dropEvent = createDropEvent(currentControl, position, source, new Point(dragRectangle.x, dragRectangle.y));
194		194
		195	listener.dragOver(dropEvent);
		196
195	if (dropEvent.relativePosition != DragCursors.INVALID) {	197	if (dropEvent.relativePosition != DragCursors.INVALID) {
196	listener.dragOver(dropEvent);	198	return new DropTarget(dropEvent);
197
198	if (dropEvent.relativePosition != DragCursors.INVALID) {
199	return new DropTarget(dropEvent);
200	}
201	}	199	}
202	}	200	}
203		201

Return to bug 13585

Lines 291-314 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/PerspectivePresentation.java (-46 / +15 lines)
291	}	291	}
292		292
293	/**	293	/**
294	* Answer a list of the view panes.
295	*/
296	private DetachedWindow[] collectDetachedWindows(Window[] windows) {
297	DetachedWindow[] result = new DetachedWindow[0];
298	for (int i = 0, length = windows.length; i < length; i++) {
299	if (windows[i] instanceof DetachedWindow
300	&& ((DetachedWindow) windows[i]).belongsToWorkbenchPage(page)) {
301	DetachedWindow[] newResult =
302	new DetachedWindow[result.length + 1];
303	System.arraycopy(result, 0, newResult, 0, result.length);
304	newResult[result.length] = (DetachedWindow) windows[i];
305	result = newResult;
306	}
307	}
308	return result;
309	}
310
311	/**
312	* Open the tracker to allow the user to move the specified part using	294	* Open the tracker to allow the user to move the specified part using
313	* keyboard.	295	* keyboard.
314	*/	296	*/
Lines 316-337 Link Here
316	DragUtil.performDrag(pane, DragUtil.getDisplayBounds(pane.getControl()));	298	DragUtil.performDrag(pane, DragUtil.getDisplayBounds(pane.getControl()));
317	}	299	}
318	/**	300	/**
319	* Answer a list of the view panes.
320	*/
321	private void collectDragParts(List result, LayoutPart[] parts) {
322	for (int i = 0, length = parts.length; i < length; i++) {
323	LayoutPart part = parts[i];
324	if (part instanceof ViewPane) {
325	result.add(part);
326	} else if (part instanceof ILayoutContainer) {
327	collectDragParts(
328	result,
329	((ILayoutContainer) part).getChildren());
330	}
331	}
332	}
333
334	/**
335	* Answer a list of the PartPlaceholder objects.	301	* Answer a list of the PartPlaceholder objects.
336	*/	302	*/
337	private PartPlaceholder[] collectPlaceholders() {	303	private PartPlaceholder[] collectPlaceholders() {
Lines 440-446 Link Here
440	disableAllDrag();	406	disableAllDrag();
441		407
442	// Reparent all views to the main window	408	// Reparent all views to the main window
443	Composite parent = (Composite) mainLayout.getParent();	409	Composite parent = mainLayout.getParent();
444	Vector children = new Vector();	410	Vector children = new Vector();
445	collectViewPanes(children, mainLayout.getChildren());	411	collectViewPanes(children, mainLayout.getChildren());
446		412
Lines 477-483 Link Here
477	ILayoutContainer oldContainer = part.getContainer();	443	ILayoutContainer oldContainer = part.getContainer();
478		444
479	// Reparent the part back to the main window	445	// Reparent the part back to the main window
480	part.reparent((Composite) mainLayout.getParent());	446	part.reparent(mainLayout.getParent());
481		447
482	// Update container.	448	// Update container.
483	if (oldContainer == null)	449	if (oldContainer == null)
Lines 903-909 Link Here
903	} else if (newContainer instanceof PartTabFolder) {	869	} else if (newContainer instanceof PartTabFolder) {
904	// move this part relative to the folder	870	// move this part relative to the folder
905	// rather than relative to the part in the folder	871	// rather than relative to the part in the folder
906	movePart(part, position, (PartTabFolder) newContainer);	872	movePart(part, position, newContainer);
907	}	873	}
908	}	874	}
909	/**	875	/**
Lines 979-992 Link Here
979	// If drop target is not registered object then reject.	945	// If drop target is not registered object then reject.
980	if (e.dropTarget == null	946	if (e.dropTarget == null
981	&& e.relativePosition != DragCursors.OFFSCREEN) {	947	&& e.relativePosition != DragCursors.OFFSCREEN) {
982	e.dropTarget = null;	948	e.relativePosition = DragCursors.INVALID;
983	e.relativePosition = offScreenPosition;	949	//e.dropTarget = null;
		950	//e.relativePosition = offScreenPosition;
984	return;	951	return;
985	}	952	}
986		953
987	// If drop target is not over view, or tab folder, reject.	954	// If drop target is not over view, or tab folder, reject.
988	if (!(e.dropTarget instanceof ViewPane	955	if (!(e.dropTarget instanceof ViewPane
989	\|\| e.dropTarget instanceof PartTabFolder)) {	956	\|\| e.dropTarget instanceof PartTabFolder)) {
		957	//e.relativePosition = DragCursors.INVALID;
990	e.dropTarget = null;	958	e.dropTarget = null;
991	e.relativePosition = offScreenPosition;	959	e.relativePosition = offScreenPosition;
992	return;	960	return;
Lines 994-999 Link Here
994		962
995	// If drag source is view ..	963	// If drag source is view ..
996	if (e.dragSource instanceof ViewPane) {	964	if (e.dragSource instanceof ViewPane) {
		965	// If target is detached window force stacking.
		966	Window window = e.dropTarget.getWindow();
		967	if (window instanceof DetachedWindow) {
		968	//e.relativePosition = DragCursors.CENTER;
		969	e.relativePosition = offScreenPosition;
		970	return;
		971	}
		972
997	if (e.dragSource == e.dropTarget) {	973	if (e.dragSource == e.dropTarget) {
998	// Reject stack onto same view	974	// Reject stack onto same view
999	if (e.relativePosition == DragCursors.CENTER) {	975	if (e.relativePosition == DragCursors.CENTER) {
Lines 1023-1035 Link Here
1023	e.relativePosition = DragCursors.INVALID;	999	e.relativePosition = DragCursors.INVALID;
1024	return;	1000	return;
1025	}	1001	}
1026	}
1027
1028	// If target is detached window force stacking.
1029	Window window = e.dropTarget.getWindow();
1030	if (window instanceof DetachedWindow) {
1031	e.relativePosition = DragCursors.CENTER;
1032	return;
1033	}	1002	}
1034		1003
1035	// All seems well	1004	// All seems well