Attachment 184245 Details for Bug 331524 – Fix

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

[patch] Fix

patch.txt (text/plain), 2.05 KB, created by Dani Megert

on 2010-12-01 07:01:19 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Dani Megert

Created: 2010-12-01 07:01:19 EST

Size: 2.05 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.workbench
>Index: Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchPreferenceDialog.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchPreferenceDialog.java,v
>retrieving revision 1.72
>diff -u -r1.72 WorkbenchPreferenceDialog.java
>--- Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchPreferenceDialog.java	23 Apr 2009 18:55:01 -0000	1.72
>+++ Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchPreferenceDialog.java	1 Dec 2010 11:59:33 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2009 IBM Corporation and others.
>+ * 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
>@@ -15,6 +15,7 @@
> 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;
>@@ -22,6 +23,7 @@
> 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
>@@ -205,7 +207,9 @@
> 			Shell shell = getShell();
> 			if ((shell != null) && (!shell.isDisposed())) {
> 				shell.open(); // make the dialog visible to properly set the focus
>-				selectedPage.getControl().setFocus();
>+				Control control = selectedPage.getControl();
>+				if (!SwtUtil.isFocusAncestor(control))
>+					control.setFocus();
> 			}
> 		}
> 		return super.open();

Actions: View | Diff

Attachments on bug 331524: 184245 | 184247