Skip to content

Commit 198638e

Browse files
committed
[WebKit] Allow disabling WebKit Browser search per Browser widget
Fixes: #2267
1 parent e2cbda9 commit 198638e

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package org.eclipse.swt.browser;
2+
3+
public class DisableWebKitBrowserSearch {
4+
5+
public static void disableSearch(Browser browser) {
6+
if (browser.webBrowser instanceof WebKit wkb) {
7+
wkb.disableSearch = true;
8+
}
9+
}
10+
}

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 disableSearch;
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 && !disableSearch && event.keyCode == 'f' && (event.stateMask & SWT.CTRL) == SWT.CTRL) {
799801
openSearchDialog();
800802
}
801803
break;

0 commit comments

Comments
 (0)