Skip to content

Commit 09c8230

Browse files
HeikoKlareHeikoKlare
committed
Use Edge/WebView2 as the default browser on Windows eclipse-platform#1466
- Introduce SWT flag SWT.IE to be used for Browser to create an Internet Explorer instance - Adapt mapping of existing VM argument for default browser to map "ie" to new Internet Explorer flag and use Edge as default - Make SWT Browser instantiate Edge on Windows by default, i.e., unless the flag SWT.IE is specified - Adapt the SWT ControlExample to represent the SWT.IE flag and properly switch between Edge, Internet Explorer and default - Adapt Browser tests to consider to new default configuration Contributes to eclipse-platform#1466
1 parent 44dda53 commit 09c8230

File tree

15 files changed

+100
-11
lines changed

15 files changed

+100
-11
lines changed

‎binaries/org.eclipse.swt.cocoa.macosx.aarch64/.settings/.api_filters

+8
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,14 @@
456456
</message_arguments>
457457
</filter>
458458
</resource>
459+
<resource path="Eclipse SWT/common/org/eclipse/swt/SWT.java" type="org.eclipse.swt.SWT">
460+
<filter id="336658481">
461+
<message_arguments>
462+
<message_argument value="org.eclipse.swt.SWT"/>
463+
<message_argument value="IE"/>
464+
</message_arguments>
465+
</filter>
466+
</resource>
459467
<resource path="META-INF/MANIFEST.MF">
460468
<filter id="926941240">
461469
<message_arguments>

‎binaries/org.eclipse.swt.cocoa.macosx.x86_64/.settings/.api_filters

+8
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,14 @@
456456
</message_arguments>
457457
</filter>
458458
</resource>
459+
<resource path="Eclipse SWT/common/org/eclipse/swt/SWT.java" type="org.eclipse.swt.SWT">
460+
<filter id="336658481">
461+
<message_arguments>
462+
<message_argument value="org.eclipse.swt.SWT"/>
463+
<message_argument value="IE"/>
464+
</message_arguments>
465+
</filter>
466+
</resource>
459467
<resource path="META-INF/MANIFEST.MF">
460468
<filter id="926941240">
461469
<message_arguments>

‎binaries/org.eclipse.swt.gtk.linux.aarch64/.settings/.api_filters

+8
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,14 @@
456456
</message_arguments>
457457
</filter>
458458
</resource>
459+
<resource path="Eclipse SWT/common/org/eclipse/swt/SWT.java" type="org.eclipse.swt.SWT">
460+
<filter id="336658481">
461+
<message_arguments>
462+
<message_argument value="org.eclipse.swt.SWT"/>
463+
<message_argument value="IE"/>
464+
</message_arguments>
465+
</filter>
466+
</resource>
459467
<resource path="META-INF/MANIFEST.MF">
460468
<filter id="926941240">
461469
<message_arguments>

‎binaries/org.eclipse.swt.gtk.linux.loongarch64/.settings/.api_filters

+8
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,14 @@
456456
</message_arguments>
457457
</filter>
458458
</resource>
459+
<resource path="Eclipse SWT/common/org/eclipse/swt/SWT.java" type="org.eclipse.swt.SWT">
460+
<filter id="336658481">
461+
<message_arguments>
462+
<message_argument value="org.eclipse.swt.SWT"/>
463+
<message_argument value="IE"/>
464+
</message_arguments>
465+
</filter>
466+
</resource>
459467
<resource path="META-INF/MANIFEST.MF">
460468
<filter id="926941240">
461469
<message_arguments>

‎binaries/org.eclipse.swt.gtk.linux.ppc64le/.settings/.api_filters

+8
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,14 @@
456456
</message_arguments>
457457
</filter>
458458
</resource>
459+
<resource path="Eclipse SWT/common/org/eclipse/swt/SWT.java" type="org.eclipse.swt.SWT">
460+
<filter id="336658481">
461+
<message_arguments>
462+
<message_argument value="org.eclipse.swt.SWT"/>
463+
<message_argument value="IE"/>
464+
</message_arguments>
465+
</filter>
466+
</resource>
459467
<resource path="META-INF/MANIFEST.MF">
460468
<filter id="926941240">
461469
<message_arguments>

‎binaries/org.eclipse.swt.gtk.linux.riscv64/.settings/.api_filters

+8
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,14 @@
456456
</message_arguments>
457457
</filter>
458458
</resource>
459+
<resource path="Eclipse SWT/common/org/eclipse/swt/SWT.java" type="org.eclipse.swt.SWT">
460+
<filter id="336658481">
461+
<message_arguments>
462+
<message_argument value="org.eclipse.swt.SWT"/>
463+
<message_argument value="IE"/>
464+
</message_arguments>
465+
</filter>
466+
</resource>
459467
<resource path="META-INF/MANIFEST.MF">
460468
<filter id="926941240">
461469
<message_arguments>

‎binaries/org.eclipse.swt.gtk.linux.x86_64/.settings/.api_filters

+8
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,14 @@
88
</message_arguments>
99
</filter>
1010
</resource>
11+
<resource path="Eclipse SWT/common/org/eclipse/swt/SWT.java" type="org.eclipse.swt.SWT">
12+
<filter id="336658481">
13+
<message_arguments>
14+
<message_argument value="org.eclipse.swt.SWT"/>
15+
<message_argument value="IE"/>
16+
</message_arguments>
17+
</filter>
18+
</resource>
1119
<resource path="META-INF/MANIFEST.MF">
1220
<filter id="926941240">
1321
<message_arguments>

‎binaries/org.eclipse.swt.win32.win32.aarch64/.settings/.api_filters

+8
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,14 @@
329329
</message_arguments>
330330
</filter>
331331
</resource>
332+
<resource path="Eclipse SWT/common/org/eclipse/swt/SWT.java" type="org.eclipse.swt.SWT">
333+
<filter id="336658481">
334+
<message_arguments>
335+
<message_argument value="org.eclipse.swt.SWT"/>
336+
<message_argument value="IE"/>
337+
</message_arguments>
338+
</filter>
339+
</resource>
332340
<resource path="Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleControlSite.java" type="org.eclipse.swt.ole.win32.OleControlSite">
333341
<filter id="643846161">
334342
<message_arguments>

‎binaries/org.eclipse.swt.win32.win32.x86_64/.settings/.api_filters

+8
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,14 @@
375375
</message_arguments>
376376
</filter>
377377
</resource>
378+
<resource path="Eclipse SWT/common/org/eclipse/swt/SWT.java" type="org.eclipse.swt.SWT">
379+
<filter id="336658481">
380+
<message_arguments>
381+
<message_argument value="org.eclipse.swt.SWT"/>
382+
<message_argument value="IE"/>
383+
</message_arguments>
384+
</filter>
385+
</resource>
378386
<resource path="Eclipse SWT/common/org/eclipse/swt/events/ArmListener.java" type="org.eclipse.swt.events.ArmListener">
379387
<filter id="576720909">
380388
<message_arguments>

‎bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/Browser.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -182,10 +182,10 @@ static int checkStyle(int style) {
182182
if (current.equalsIgnoreCase ("webkit")) { //$NON-NLS-1$
183183
DefaultType = SWT.WEBKIT;
184184
break;
185+
} else if (current.equalsIgnoreCase ("ie") && "win32".equals (platform)) { //$NON-NLS-1$ //$NON-NLS-2$
186+
DefaultType = SWT.IE;
185187
} else if (current.equalsIgnoreCase ("edge") && "win32".equals (platform)) { //$NON-NLS-1$ //$NON-NLS-2$
186188
DefaultType = SWT.EDGE;
187-
} else if (current.equalsIgnoreCase ("ie") && "win32".equals (platform)) { //$NON-NLS-1$ //$NON-NLS-2$
188-
DefaultType = SWT.NONE;
189189
break;
190190
}
191191
index = newIndex + 1;
@@ -196,7 +196,7 @@ static int checkStyle(int style) {
196196
}
197197
}
198198
/* If particular backend isn't specified, use the value from the system property. */
199-
if ((style & (SWT.WEBKIT | SWT.EDGE)) == 0) {
199+
if ((style & (SWT.WEBKIT | SWT.IE | SWT.EDGE)) == 0) {
200200
style |= DefaultType;
201201
}
202202
if ("win32".equals (platform) && (style & SWT.EDGE) != 0) { //$NON-NLS-1$

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ class BrowserFactory {
1919

2020
WebBrowser createWebBrowser (int style) {
2121
// This function can't throw, otherwise the Browser will be left in inconsistent state.
22-
if ((style & SWT.EDGE) != 0) {
22+
if ((style & SWT.IE) != 0) {
2323
try {
24-
return new Edge();
24+
return new IE();
2525
} catch (SWTError e) {
2626
System.err.println(e);
2727
}
2828
}
29-
return new IE ();
29+
return new Edge ();
3030
}
3131
}

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

+12-2
Original file line numberDiff line numberDiff line change
@@ -2564,8 +2564,6 @@ public class SWT {
25642564
/**
25652565
* Style constant specifying that a Browser should use Edge (WebView2)
25662566
* for rendering its content (value is 1&lt;&lt;18).
2567-
* <p>NOTE: Edge integration is experimental, it isn't a drop-in replacement
2568-
* for Internet Explorer.</p>
25692567
* <p><b>Used By:</b></p>
25702568
* <ul>
25712569
* <li><code>Browser</code></li>
@@ -2575,6 +2573,18 @@ public class SWT {
25752573
*/
25762574
public static final int EDGE = 1 << 18;
25772575

2576+
/**
2577+
* Style constant specifying that a Browser should use Internet Explorer
2578+
* for rendering its content (value is 1&lt;&lt;19).
2579+
* <p><b>Used By:</b></p>
2580+
* <ul>
2581+
* <li><code>Browser</code></li>
2582+
* </ul>
2583+
*
2584+
* @since 3.129
2585+
*/
2586+
public static final int IE = 1 << 19;
2587+
25782588
/**
25792589
* Style constant for balloon behavior (value is 1&lt;&lt;12).
25802590
* <p><b>Used By:</b></p>

‎bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -3686,9 +3686,9 @@ public void setRedraw (boolean redraw) {
36863686
}
36873687

36883688
private boolean embedsWin32Control () {
3689-
if (this instanceof Browser) {
3689+
if (this instanceof Browser browser) {
36903690
// The Edge browser embeds webView2
3691-
return (getStyle() & SWT.EDGE) != 0;
3691+
return "edge".equals(browser.getBrowserType());
36923692
}
36933693

36943694
if (this instanceof OleClientSite) {

‎examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/BrowserTab.java

+5
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class BrowserTab extends Tab {
4949
/* Style widgets added to the "Style" group */
5050
Button webKitButton;
5151
Button edgeButton;
52+
Button ieButton;
5253

5354
String errorMessage, lastText, lastUrl;
5455

@@ -94,6 +95,7 @@ void createExampleWidgets () {
9495
if (borderButton.getSelection ()) style |= SWT.BORDER;
9596
if (webKitButton.getSelection ()) style |= SWT.WEBKIT;
9697
if (edgeButton.getSelection ()) style |= SWT.EDGE;
98+
if (ieButton.getSelection ()) style |= SWT.IE;
9799

98100
/* Create the example widgets */
99101
try {
@@ -168,6 +170,8 @@ void createStyleGroup () {
168170
webKitButton.setText ("SWT.WEBKIT");
169171
edgeButton = new Button (styleGroup, SWT.RADIO);
170172
edgeButton.setText ("SWT.EDGE");
173+
ieButton = new Button (styleGroup, SWT.RADIO);
174+
ieButton.setText ("SWT.IE");
171175
borderButton = new Button (styleGroup, SWT.CHECK);
172176
borderButton.setText ("SWT.BORDER");
173177
}
@@ -345,6 +349,7 @@ void setExampleWidgetState () {
345349
super.setExampleWidgetState ();
346350
webKitButton.setSelection (browser == null ? false : (browser.getStyle () & SWT.WEBKIT) != 0);
347351
edgeButton.setSelection (browser == null ? false : (browser.getStyle () & SWT.EDGE) != 0);
352+
ieButton.setSelection (browser == null ? false : (browser.getStyle () & SWT.IE) != 0);
348353
borderButton.setSelection (browser == null ? false : (browser.getStyle () & SWT.BORDER) != 0);
349354
}
350355
}

‎tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_Browser.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,10 @@ public static Collection<Object[]> browserFlagsToTest() {
149149
// NOTE: This is currently disabled due to test issues in the CI
150150
// Execute Edge tests first, because IE starts some OS timer that conflicts with Edge event handling
151151
// browserFlags.add(0, new Object[] {SWT.EDGE});
152+
browserFlags.add(new Object[] {SWT.IE});
153+
} else {
154+
browserFlags.add(new Object[] {SWT.NONE});
152155
}
153-
browserFlags.add(new Object[] {SWT.NONE});
154156
return browserFlags;
155157
}
156158

0 commit comments

Comments
 (0)