Merge branch 'eclipse-platform:master' into master

Author: fedejeanne

bundles/org.eclipse.swt/Eclipse SWT Browser/gtk/org/eclipse/swt/browser/BrowserFactory.java

@@ -13,13 +13,17 @@
  *******************************************************************************/
 package org.eclipse.swt.browser;
 
+import org.eclipse.swt.*;
+
 class BrowserFactory {
 
 WebBrowser createWebBrowser (int style) {
 	boolean webkitInstalled = WebKit.IsInstalled ();
 	if (!webkitInstalled) return null;
 
-	return new WebKit ();
+	WebKit webKit = new WebKit ();
+	webKit.enableSearch = (style & SWT.SEARCH) == SWT.SEARCH;
+	return webKit;
 }
 
 }

bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DropTarget.java

@@ -242,29 +242,35 @@ void createCOMInterfaces() {
 		public long method2(long[] args) {return Release();}
 		@Override
 		public long method3(long[] args) {
-			if (args.length == 5) {
-				return DragEnter(args[0], (int)args[1], (int)args[2], (int)args[3], args[4]);
-			} else {
-				return DragEnter_64(args[0], (int)args[1], args[2], args[3]);
-			}
+			return Win32DPIUtils.runWithProperDPIAwareness(() -> {
+				if (args.length == 5) {
+					return DragEnter(args[0], (int)args[1], (int)args[2], (int)args[3], args[4]);
+				} else {
+					return DragEnter_64(args[0], (int)args[1], args[2], args[3]);
+				}
+			});
 		}
 		@Override
 		public long method4(long[] args) {
-			if (args.length == 4) {
-				return DragOver((int)args[0], (int)args[1], (int)args[2], args[3]);
-			} else {
-				return DragOver_64((int)args[0], args[1], args[2]);
-			}
+			return Win32DPIUtils.runWithProperDPIAwareness(() -> {
+				if (args.length == 4) {
+					return DragOver((int)args[0], (int)args[1], (int)args[2], args[3]);
+				} else {
+					return DragOver_64((int)args[0], args[1], args[2]);
+				}
+			});
 		}
 		@Override
 		public long method5(long[] args) {return DragLeave();}
 		@Override
 		public long method6(long[] args) {
-			if (args.length == 5) {
-				return Drop(args[0], (int)args[1], (int)args[2], (int)args[3], args[4]);
-			} else {
-				return Drop_64(args[0], (int)args[1], args[2], args[3]);
-			}
+			return Win32DPIUtils.runWithProperDPIAwareness(() -> {
+				if (args.length == 5) {
+					return Drop(args[0], (int)args[1], (int)args[2], (int)args[3], args[4]);
+				} else {
+					return Drop_64(args[0], (int)args[1], args[2], args[3]);
+				}
+			});
 		}
 	};
 }

bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java

@@ -101,6 +101,8 @@ class WebKit extends WebBrowser {
 	private Point searchShellLocation;
 	private Shell searchShell;
 	private String searchText;
+	boolean enableSearch;
+
 
 	boolean firstLoad = true;
 	static boolean FirstCreate = true;
@@ -208,7 +210,7 @@ class WebKit extends WebBrowser {
 	static final boolean ignoreTls;
 
 	/** Flag that disables browser searching added on top of the WebKit browser. */
-	static final boolean disableBrowserSearch;
+	static final boolean disableBrowserSearchGlobally;
 
 	static {
 			Proc2 = new Callback (WebKit.class, "Proc", 2); //$NON-NLS-1$
@@ -257,7 +259,7 @@ class WebKit extends WebBrowser {
 				NativePendingCookies = null;
 			}
 			ignoreTls = "true".equals(System.getProperty("org.eclipse.swt.internal.webkitgtk.ignoretlserrors"));
-			disableBrowserSearch = "true".equals(System.getProperty("org.eclipse.swt.internal.webkitgtk.disableBrowserSearch"));
+			disableBrowserSearchGlobally = "true".equals(System.getProperty("org.eclipse.swt.internal.webkitgtk.disableBrowserSearch"));
 	}
 
 	@Override
@@ -795,7 +797,7 @@ public void create (Composite parent, int style) {
 				break;
 			}
 			case SWT.KeyDown: {
-				if (!disableBrowserSearch && event.keyCode == 'f' && (event.stateMask & SWT.CTRL) == SWT.CTRL) {
+				if (!disableBrowserSearchGlobally && enableSearch && event.keyCode == 'f' && (event.stateMask & SWT.CTRL) == SWT.CTRL) {
 					openSearchDialog();
 				}
 				break;
@@ -2711,13 +2713,6 @@ private void openSearchDialog() {
 		return;
 	}
 	Shell browserShell = browser.getShell();
-	if (browserShell == null || browserShell.isDisposed() || (browserShell.getStyle() & SWT.TOOL) == SWT.TOOL) {
-		/*
-		 * We don't provide search capabilities for browsers in a pop-up.
-		 * We could cause issues with pop-up focus handling when the search shell is opened.
-		 */
-		return;
-	}
 	Shell shell = new Shell(browserShell, SWT.TOOL | SWT.MODELESS);
 	Rectangle browserArea = browser.getClientArea();
 	int height = 45;

bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/SWT.java

@@ -1558,6 +1558,7 @@ public class SWT {
 	 * <p><b>Used By:</b></p>
 	 * <ul>
 	 * <li><code>Text</code></li>
+	 * <li><code>Browser</code> (WebKit and GTK only)</li>
 	 * </ul>
 	 *
 	 * @since 3.3