Skip to content

Commit c0093cc

Browse files
committed
[WebKit] Allow enabling WebKit Browser search per Browser widget
This change disables the search added for #2222 per default, allowing client code to enable the search with the SWT.SEARCH style. Fixes: #2267
1 parent e2cbda9 commit c0093cc

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,17 @@
1313
*******************************************************************************/
1414
package org.eclipse.swt.browser;
1515

16+
import org.eclipse.swt.*;
17+
1618
class BrowserFactory {
1719

1820
WebBrowser createWebBrowser (int style) {
1921
boolean webkitInstalled = WebKit.IsInstalled ();
2022
if (!webkitInstalled) return null;
2123

22-
return new WebKit ();
24+
WebKit webKit = new WebKit ();
25+
webKit.enableSearch = (style & SWT.SEARCH) == SWT.SEARCH;
26+
return webKit;
2327
}
2428

2529
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ class WebKit extends WebBrowser {
101101
private Point searchShellLocation;
102102
private Shell searchShell;
103103
private String searchText;
104+
boolean enableSearch;
105+
104106

105107
boolean firstLoad = true;
106108
static boolean FirstCreate = true;
@@ -795,7 +797,7 @@ public void create (Composite parent, int style) {
795797
break;
796798
}
797799
case SWT.KeyDown: {
798-
if (!disableBrowserSearch && event.keyCode == 'f' && (event.stateMask & SWT.CTRL) == SWT.CTRL) {
800+
if (!disableBrowserSearch && enableSearch && event.keyCode == 'f' && (event.stateMask & SWT.CTRL) == SWT.CTRL) {
799801
openSearchDialog();
800802
}
801803
break;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1558,6 +1558,7 @@ public class SWT {
15581558
* <p><b>Used By:</b></p>
15591559
* <ul>
15601560
* <li><code>Text</code></li>
1561+
* <li><code>Browser</code> (WebKit and GTK only)</li>
15611562
* </ul>
15621563
*
15631564
* @since 3.3

0 commit comments

Comments
 (0)