From 1fdedbff08ae124f8d9e438d5a4b468c324907a8 Mon Sep 17 00:00:00 2001 From: Amartya Parijat Date: Tue, 13 May 2025 15:18:25 +0200 Subject: [PATCH 1/2] Add MouseEnter & MouseMove Event in PopupCloser This commit adds MouseEnter and MouseMove event in the PopupCloser, as Edge browser can only react to mouse movements and not mouse clicks. This also makes the beahviour of PopupCloser consistent with AbstractHoverInformationControl:Closer. fixes https://github.com/eclipse-platform/eclipse.platform.swt/issues/2072 --- .../eclipse/jface/text/contentassist/PopupCloser.java | 10 +++++++++- .../editors/text/TextEditorMessages.properties | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/PopupCloser.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/PopupCloser.java index 9aba5cea763..28d1e32dfa9 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/PopupCloser.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/PopupCloser.java @@ -109,6 +109,9 @@ public void install(ContentAssistant contentAssistant, Table table, AdditionalIn fDisplay.addFilter(SWT.Deactivate, this); fDisplay.addFilter(SWT.MouseUp, this); + + fDisplay.addFilter(SWT.MouseMove, this); + fDisplay.addFilter(SWT.MouseEnter, this); } } @@ -130,6 +133,9 @@ public void uninstall() { fDisplay.removeFilter(SWT.Deactivate, this); fDisplay.removeFilter(SWT.MouseUp, this); + + fDisplay.removeFilter(SWT.MouseMove, this); + fDisplay.removeFilter(SWT.MouseEnter, this); } } @@ -206,6 +212,8 @@ else if (event.type == SWT.MouseVerticalWheel) } break; + case SWT.MouseEnter: + case SWT.MouseMove: case SWT.MouseUp: if (fAdditionalInfoController == null || fAdditionalInfoController.getInternalAccessor().isReplaceInProgress()) break; @@ -224,7 +232,7 @@ else if (event.type == SWT.MouseVerticalWheel) } // XXX: workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=212392 : - control.getShell().getDisplay().asyncExec(() -> fAdditionalInfoController.getInternalAccessor().replaceInformationControl(true)); + fAdditionalInfoController.getInternalAccessor().replaceInformationControl(event.type == SWT.MouseUp); } } } diff --git a/bundles/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/TextEditorMessages.properties b/bundles/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/TextEditorMessages.properties index c0141258985..2e5a7267edc 100644 --- a/bundles/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/TextEditorMessages.properties +++ b/bundles/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/TextEditorMessages.properties @@ -12,7 +12,7 @@ # IBM Corporation - initial API and implementation ############################################################################### -EditorsPlugin_additionalInfo_affordance=Press 'Tab' from proposal table or click for focus +EditorsPlugin_additionalInfo_affordance=Press 'Tab' from proposal table or click/hover for focus EditorsPlugin_internal_error=Internal Error TextEditorPreferencePage_displayedTabWidth=Displayed &tab width: From 70f04aedb6d1d62fb91d59b53514ee17f42c46e9 Mon Sep 17 00:00:00 2001 From: fedejeanne Date: Tue, 24 Jun 2025 13:10:46 +0200 Subject: [PATCH 2/2] Version bump(s) for 4.37 stream --- bundles/org.eclipse.ui.editors/META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.eclipse.ui.editors/META-INF/MANIFEST.MF b/bundles/org.eclipse.ui.editors/META-INF/MANIFEST.MF index a85e3b30fe8..ada22acef29 100644 --- a/bundles/org.eclipse.ui.editors/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.ui.editors/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.ui.editors; singleton:=true -Bundle-Version: 3.20.0.qualifier +Bundle-Version: 3.20.100.qualifier Bundle-Activator: org.eclipse.ui.internal.editors.text.EditorsPlugin Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName