Attachment #184247 for bug #331524

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




/*******************************************************************************
 * Copyright (c) 2000, 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

import org.eclipse.jface.preference.IPreferenceNode;
import org.eclipse.jface.preference.IPreferencePage;
import org.eclipse.jface.preference.PreferenceManager;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchWindow;

import org.eclipse.ui.activities.WorkbenchActivityHelper;
import org.eclipse.ui.internal.IWorkbenchHelpContextIds;
import org.eclipse.ui.internal.WorkbenchPlugin;
import org.eclipse.ui.internal.dnd.SwtUtil;

/**
 * Prefence dialog for the workbench including the ability to load/save

			Shell shell = getShell();
			if ((shell != null) && (!shell.isDisposed())) {
				shell.open(); // make the dialog visible to properly set the focus
				Control control = selectedPage.getControl();
				if (!SwtUtil.isFocusAncestor(control))
					control.setFocus();
			}
		}
		return super.open();




/*******************************************************************************
 * Copyright (c) 2004, 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

 *******************************************************************************/
package org.eclipse.ui.internal.dnd;

import org.eclipse.core.runtime.Assert;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.widgets.Composite;

    }
    
    /**
	 * Determines if one control is a child of another.
	 * 
	 * @param potentialParent
	 * @param childToTest
	 * @return <code>true</code> if the second argument is a child of the first
	 *         or the same object, <code>false</code> otherwise
	 */
    public static boolean isChild(Control potentialParent, Control childToTest) {
        if (childToTest == null) {
            return false;

    }
    
    public static boolean isFocusAncestor(Control potentialParent) {
		if (potentialParent == null)
			return false;
        Control focusControl = Display.getCurrent().getFocusControl();
        if (focusControl == null) {
            return false;

    }

    /**
	 * Finds and returns the most specific SWT control at the given location.
	 * (Note: this does a DFS on the SWT widget hierarchy, which is slow).
	 * 
	 * @param displayToSearch
	 * @param locationToFind
	 * @return the most specific SWT control at the given location
	 */
    public static Control findControl(Display displayToSearch,
            Point locationToFind) {
        Shell[] shells = displayToSearch.getShells();

    }
    
    /**
	 * Finds the control at the given location.
	 * 
	 * @param toSearch
	 * @param locationToFind
	 *            location (in display coordinates)
	 * @return the control at the given location
	 */
    public static Control findControl(Composite toSearch, Point locationToFind) {
        Control[] children = toSearch.getChildren();


    }

    /**
	 * 
	 * Returns true iff the given rectangle is located in the client area of any
	 * monitor.
	 * 
	 * @param display
	 *            the display
	 * @param someRectangle
	 *            a rectangle in display coordinates (not null)
	 * @return true iff the given point can be seen on any monitor
	 */
    public static boolean intersectsAnyMonitor(Display display,
            Rectangle someRectangle) {
        Monitor[] monitors = display.getMonitors();

Return to bug 331524

Lines 1-5 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/dnd/SwtUtil.java (-30 / +34 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2004, 2006 IBM Corporation and others.	2	* Copyright (c) 2004, 2010 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 10-16 Link Here
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.ui.internal.dnd;	11	package org.eclipse.ui.internal.dnd;
12		12
13	import org.eclipse.core.runtime.Assert;
14	import org.eclipse.swt.graphics.Point;	13	import org.eclipse.swt.graphics.Point;
15	import org.eclipse.swt.graphics.Rectangle;	14	import org.eclipse.swt.graphics.Rectangle;
16	import org.eclipse.swt.widgets.Composite;	15	import org.eclipse.swt.widgets.Composite;
Lines 80-92 Link Here
80	}	79	}
81		80
82	/**	81	/**
83	* Determines if one control is a child of another. Returns true iff the second	82	* Determines if one control is a child of another.
84	* argument is a child of the first (or the same object).	83	*
85	*	84	* @param potentialParent
86	* @param potentialParent	85	* @param childToTest
87	* @param childToTest	86	* @return <code>true</code> if the second argument is a child of the first
88	* @return	87	* or the same object, <code>false</code> otherwise
89	*/	88	*/
90	public static boolean isChild(Control potentialParent, Control childToTest) {	89	public static boolean isChild(Control potentialParent, Control childToTest) {
91	if (childToTest == null) {	90	if (childToTest == null) {
92	return false;	91	return false;
Lines 100-106 Link Here
100	}	99	}
101		100
102	public static boolean isFocusAncestor(Control potentialParent) {	101	public static boolean isFocusAncestor(Control potentialParent) {
103	Assert.isNotNull(potentialParent);	102	if (potentialParent == null)
		103	return false;
104	Control focusControl = Display.getCurrent().getFocusControl();	104	Control focusControl = Display.getCurrent().getFocusControl();
105	if (focusControl == null) {	105	if (focusControl == null) {
106	return false;	106	return false;
Lines 109-121 Link Here
109	}	109	}
110		110
111	/**	111	/**
112	* Finds and returns the most specific SWT control at the given location.	112	* Finds and returns the most specific SWT control at the given location.
113	* (Note: this does a DFS on the SWT widget hierarchy, which is slow).	113	* (Note: this does a DFS on the SWT widget hierarchy, which is slow).
114	*	114	*
115	* @param displayToSearch	115	* @param displayToSearch
116	* @param locationToFind	116	* @param locationToFind
117	* @return	117	* @return the most specific SWT control at the given location
118	*/	118	*/
119	public static Control findControl(Display displayToSearch,	119	public static Control findControl(Display displayToSearch,
120	Point locationToFind) {	120	Point locationToFind) {
121	Shell[] shells = displayToSearch.getShells();	121	Shell[] shells = displayToSearch.getShells();
Lines 195-206 Link Here
195	}	195	}
196		196
197	/**	197	/**
198	* Finds the control in the given location	198	* Finds the control at the given location.
199	*	199	*
200	* @param toSearch	200	* @param toSearch
201	* @param locationToFind location (in display coordinates)	201	* @param locationToFind
202	* @return	202	* location (in display coordinates)
203	*/	203	* @return the control at the given location
		204	*/
204	public static Control findControl(Composite toSearch, Point locationToFind) {	205	public static Control findControl(Composite toSearch, Point locationToFind) {
205	Control[] children = toSearch.getChildren();	206	Control[] children = toSearch.getChildren();
206		207
Lines 208-220 Link Here
208	}	209	}
209		210
210	/**	211	/**
211	*	212	*
212	* Returns true iff the given rectangle is located in the client area of any	213	* Returns true iff the given rectangle is located in the client area of any
213	* monitor.	214	* monitor.
214	*	215	*
215	* @param someRectangle a rectangle in display coordinates (not null)	216	* @param display
216	* @return true iff the given point can be seen on any monitor	217	* the display
217	*/	218	* @param someRectangle
		219	* a rectangle in display coordinates (not null)
		220	* @return true iff the given point can be seen on any monitor
		221	*/
218	public static boolean intersectsAnyMonitor(Display display,	222	public static boolean intersectsAnyMonitor(Display display,
219	Rectangle someRectangle) {	223	Rectangle someRectangle) {
220	Monitor[] monitors = display.getMonitors();	224	Monitor[] monitors = display.getMonitors();

Lines 1-5 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchPreferenceDialog.java (-2 / +6 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2009 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 15-20 Link Here
15	import org.eclipse.jface.preference.IPreferenceNode;	15	import org.eclipse.jface.preference.IPreferenceNode;
16	import org.eclipse.jface.preference.IPreferencePage;	16	import org.eclipse.jface.preference.IPreferencePage;
17	import org.eclipse.jface.preference.PreferenceManager;	17	import org.eclipse.jface.preference.PreferenceManager;
		18	import org.eclipse.swt.widgets.Control;
18	import org.eclipse.swt.widgets.Shell;	19	import org.eclipse.swt.widgets.Shell;
19	import org.eclipse.ui.IWorkbench;	20	import org.eclipse.ui.IWorkbench;
20	import org.eclipse.ui.IWorkbenchWindow;	21	import org.eclipse.ui.IWorkbenchWindow;
Lines 22-27 Link Here
22	import org.eclipse.ui.activities.WorkbenchActivityHelper;	23	import org.eclipse.ui.activities.WorkbenchActivityHelper;
23	import org.eclipse.ui.internal.IWorkbenchHelpContextIds;	24	import org.eclipse.ui.internal.IWorkbenchHelpContextIds;
24	import org.eclipse.ui.internal.WorkbenchPlugin;	25	import org.eclipse.ui.internal.WorkbenchPlugin;
		26	import org.eclipse.ui.internal.dnd.SwtUtil;
25		27
26	/**	28	/**
27	* Prefence dialog for the workbench including the ability to load/save	29	* Prefence dialog for the workbench including the ability to load/save
Lines 205-211 Link Here
205	Shell shell = getShell();	207	Shell shell = getShell();
206	if ((shell != null) && (!shell.isDisposed())) {	208	if ((shell != null) && (!shell.isDisposed())) {
207	shell.open(); // make the dialog visible to properly set the focus	209	shell.open(); // make the dialog visible to properly set the focus
208	selectedPage.getControl().setFocus();	210	Control control = selectedPage.getControl();
		211	if (!SwtUtil.isFocusAncestor(control))
		212	control.setFocus();
209	}	213	}
210	}	214	}
211	return super.open();	215	return super.open();