diff options
| author | Leo Ufimtsev | 2017-03-17 14:19:22 +0000 |
|---|---|---|
| committer | Leo Ufimtsev | 2017-03-17 14:30:29 +0000 |
| commit | a428d7cc84d7b3df4c54401f685ddd8bab358790 (patch) | |
| tree | eb2c16930ff584a60465758accc66acfacced89e | |
| parent | c0c4b575250af4333ece3b7d04b3ad2a1aaf24a6 (diff) | |
| download | eclipse.platform.swt-a428d7cc84d7b3df4c54401f685ddd8bab358790.tar.gz eclipse.platform.swt-a428d7cc84d7b3df4c54401f685ddd8bab358790.tar.xz eclipse.platform.swt-a428d7cc84d7b3df4c54401f685ddd8bab358790.zip | |
Bug 513492: [webkit2] Port VisibilityWindow event details
Fixing small typo which is causing breakage.
And reverting small hotfix to Browser5, as it seems to cause Hudson
to miss-behave.
Change-Id: Ideb196d7a6e26d81b07f9efe5074bb1639f6b39b
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=513492
Signed-off-by: Leo Ufimtsev <lufimtse@redhat.com>
2 files changed, 2 insertions, 5 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java index adba447c6c..a38860a27f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java @@ -2761,7 +2761,7 @@ long /*int*/ webkit_web_view_ready (long /*int*/ web_view) { newEvent.statusBar = webkit_settings_get(settings, WebKitGTK.statusbar_visible) != 0; newEvent.addressBar = webkit_settings_get(settings, WebKitGTK.toolbar_visible) != 0; int x = webkit_settings_get(settings, WebKitGTK.x); - int y = webkit_settings_get(settings, WebKitGTK.x); + int y = webkit_settings_get(settings, WebKitGTK.y); int width = webkit_settings_get(settings, WebKitGTK.width); int height = webkit_settings_get(settings, WebKitGTK.height); if (x != -1 && y != -1) @@ -2774,9 +2774,9 @@ long /*int*/ webkit_web_view_ready (long /*int*/ web_view) { newEvent.menuBar = webkit_settings_get(properties, WebKitGTK.menubar_visible) != 0; newEvent.statusBar = webkit_settings_get(properties, WebKitGTK.statusbar_visible) != 0; newEvent.toolBar = webkit_settings_get(properties, WebKitGTK.toolbar_visible) != 0; + GdkRectangle rect = new GdkRectangle(); WebKitGTK.webkit_window_properties_get_geometry(properties, rect); - newEvent.location = new Point(Math.max(0, rect.x),Math.max(0, rect.y)); int width = rect.width; diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Browser5_sizing_and_bounds.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Browser5_sizing_and_bounds.java index 210f238615..92122cd568 100644 --- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Browser5_sizing_and_bounds.java +++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Browser5_sizing_and_bounds.java @@ -37,9 +37,6 @@ public class Browser5_sizing_and_bounds { static int cntClosed = 0; public static boolean test1(String url) { - index = 0; - cntPassed = 0; - cntClosed = 0; if (verbose) System.out.println("javascript window.open with location and size parameters - args: "+url+"\n Expected Event Sequence: Visibility.show"); passed = false; |