Provide an option to disable the search dialog via Strg-F on list and

chrst4 · iloveeclipse · commit ccbd39c20a1b · 2025-03-24T11:47:39.000+01:00
tables #1830 add SWT.NO_SEARCH flag used in Table, Tree and List to prevent the interactive search (popup) in a GTK environment when set to true.
diff --git a/binaries/org.eclipse.swt.cocoa.macosx.aarch64/.settings/.api_filters b/binaries/org.eclipse.swt.cocoa.macosx.aarch64/.settings/.api_filters
@@ -463,6 +463,12 @@
                 <message_argument value="IE"/>
             </message_arguments>
         </filter>
+        <filter id="336658481">
+            <message_arguments>
+                <message_argument value="org.eclipse.swt.SWT"/>
+                <message_argument value="NO_SEARCH"/>
+            </message_arguments>
+        </filter>
     </resource>
     <resource path="META-INF/MANIFEST.MF">
         <filter id="926941240">
diff --git a/binaries/org.eclipse.swt.cocoa.macosx.x86_64/.settings/.api_filters b/binaries/org.eclipse.swt.cocoa.macosx.x86_64/.settings/.api_filters
@@ -463,6 +463,12 @@
                 <message_argument value="IE"/>
             </message_arguments>
         </filter>
+        <filter id="336658481">
+            <message_arguments>
+                <message_argument value="org.eclipse.swt.SWT"/>
+                <message_argument value="NO_SEARCH"/>
+            </message_arguments>
+        </filter>
     </resource>
     <resource path="META-INF/MANIFEST.MF">
         <filter id="926941240">
diff --git a/binaries/org.eclipse.swt.gtk.linux.aarch64/.settings/.api_filters b/binaries/org.eclipse.swt.gtk.linux.aarch64/.settings/.api_filters
@@ -463,6 +463,12 @@
                 <message_argument value="IE"/>
             </message_arguments>
         </filter>
+        <filter id="336658481">
+            <message_arguments>
+                <message_argument value="org.eclipse.swt.SWT"/>
+                <message_argument value="NO_SEARCH"/>
+            </message_arguments>
+        </filter>
     </resource>
     <resource path="META-INF/MANIFEST.MF">
         <filter id="926941240">
diff --git a/binaries/org.eclipse.swt.gtk.linux.loongarch64/.settings/.api_filters b/binaries/org.eclipse.swt.gtk.linux.loongarch64/.settings/.api_filters
@@ -463,6 +463,12 @@
                 <message_argument value="IE"/>
             </message_arguments>
         </filter>
+        <filter id="336658481">
+            <message_arguments>
+                <message_argument value="org.eclipse.swt.SWT"/>
+                <message_argument value="NO_SEARCH"/>
+            </message_arguments>
+        </filter>
     </resource>
     <resource path="META-INF/MANIFEST.MF">
         <filter id="926941240">
diff --git a/binaries/org.eclipse.swt.gtk.linux.ppc64le/.settings/.api_filters b/binaries/org.eclipse.swt.gtk.linux.ppc64le/.settings/.api_filters
@@ -463,6 +463,12 @@
                 <message_argument value="IE"/>
             </message_arguments>
         </filter>
+        <filter id="336658481">
+            <message_arguments>
+                <message_argument value="org.eclipse.swt.SWT"/>
+                <message_argument value="NO_SEARCH"/>
+            </message_arguments>
+        </filter>
     </resource>
     <resource path="META-INF/MANIFEST.MF">
         <filter id="926941240">
diff --git a/binaries/org.eclipse.swt.gtk.linux.riscv64/.settings/.api_filters b/binaries/org.eclipse.swt.gtk.linux.riscv64/.settings/.api_filters
@@ -463,6 +463,12 @@
                 <message_argument value="IE"/>
             </message_arguments>
         </filter>
+        <filter id="336658481">
+            <message_arguments>
+                <message_argument value="org.eclipse.swt.SWT"/>
+                <message_argument value="NO_SEARCH"/>
+            </message_arguments>
+        </filter>
     </resource>
     <resource path="META-INF/MANIFEST.MF">
         <filter id="926941240">
diff --git a/binaries/org.eclipse.swt.gtk.linux.x86_64/.settings/.api_filters b/binaries/org.eclipse.swt.gtk.linux.x86_64/.settings/.api_filters
@@ -12,7 +12,7 @@
         <filter id="336658481">
             <message_arguments>
                 <message_argument value="org.eclipse.swt.SWT"/>
-                <message_argument value="IE"/>
+                <message_argument value="NO_SEARCH"/>
             </message_arguments>
         </filter>
     </resource>
diff --git a/binaries/org.eclipse.swt.win32.win32.aarch64/.settings/.api_filters b/binaries/org.eclipse.swt.win32.win32.aarch64/.settings/.api_filters
@@ -336,6 +336,12 @@
                 <message_argument value="IE"/>
             </message_arguments>
         </filter>
+        <filter id="336658481">
+            <message_arguments>
+                <message_argument value="org.eclipse.swt.SWT"/>
+                <message_argument value="NO_SEARCH"/>
+            </message_arguments>
+        </filter>
     </resource>
     <resource path="Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleControlSite.java" type="org.eclipse.swt.ole.win32.OleControlSite">
         <filter id="643846161">
diff --git a/binaries/org.eclipse.swt.win32.win32.x86_64/.settings/.api_filters b/binaries/org.eclipse.swt.win32.win32.x86_64/.settings/.api_filters
@@ -382,6 +382,12 @@
                 <message_argument value="IE"/>
             </message_arguments>
         </filter>
+        <filter id="336658481">
+            <message_arguments>
+                <message_argument value="org.eclipse.swt.SWT"/>
+                <message_argument value="NO_SEARCH"/>
+            </message_arguments>
+        </filter>
     </resource>
     <resource path="Eclipse SWT/common/org/eclipse/swt/events/ArmListener.java" type="org.eclipse.swt.events.ArmListener">
         <filter id="576720909">
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/SWT.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/SWT.java
@@ -1564,6 +1564,20 @@ public class SWT {
 	 */
 	public static final int SEARCH = 1 << 7;
 
+    /**
+     * Style constant for disabling GTK interactive search popup (value is 1&lt;&lt;10).
+     * <br>Note that this is a <em>HINT</em> and is currently only supported on GTK.
+     * <p><b>Used By:</b></p>
+     * <ul>
+     * <li><code>List</code></li>
+     * <li><code>Table</code></li>
+     * <li><code>Tree</code></li>
+     * </ul>
+     *
+     * @since 3.130
+     */
+    public static final int NO_SEARCH = 1 << 10;
+
 	/**
 	 * Style constant for simple (not drop down) behavior (value is 1&lt;&lt;6).
 	 * <br>Note that this is a <em>HINT</em>.
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/List.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/List.java
@@ -28,7 +28,7 @@
  * when a string is selected.  A list may be single or multi select.
  * <dl>
  * <dt><b>Styles:</b></dt>
- * <dd>SINGLE, MULTI</dd>
+ * <dd>SINGLE, MULTI, NO_SEARCH</dd>
  * <dt><b>Events:</b></dt>
  * <dd>Selection, DefaultSelection</dd>
  * </dl>
@@ -248,15 +248,8 @@ void createHandle (int index) {
 			GTK3.gtk_scrolled_window_set_shadow_type (scrolledHandle, GTK.GTK_SHADOW_ETCHED_IN);
 		}
 	}
-	/*
-	* Bug in GTK. When a treeview is the child of an override shell,
-	* and if the user has ever invokes the interactive search field,
-	* and the treeview is disposed on a focus out event, it segment
-	* faults. The fix is to disable the search field in an override
-	* shell.
-	*/
-	if ((getShell ().style & SWT.ON_TOP) != 0) {
-		GTK.gtk_tree_view_set_search_column (handle, -1);
+	if (!search_enabled()) {
+		GTK.gtk_tree_view_set_search_column(handle, -1);
 	}
 	// In GTK 3 font description is inherited from parent widget which is not how SWT has always worked,
 	// reset to default font to get the usual behavior
@@ -1299,6 +1292,20 @@ public void removeSelectionListener(SelectionListener listener) {
 	eventTable.unhook (SWT.DefaultSelection,listener);
 }
 
+private boolean search_enabled() {
+	/* Disable searching when using NO_SEARCH */
+	if ((style & SWT.NO_SEARCH) != 0
+		/*
+		* Bug in GTK. When a treeview is the child of an override shell,
+		* and if the user has ever invokes the interactive search field,
+		* and the treeview is disposed on a focus out event, it segment
+		* faults. The fix is to disable the search field in an override
+		* shell.
+		*/
+		|| (getShell ().style & SWT.ON_TOP) != 0) return false;
+	return true;
+}
+
 /**
  * Selects the item at the given zero-relative index in the receiver's
  * list.  If the item at the index was already selected, it remains
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java
@@ -59,7 +59,7 @@
  * </p>
  * <dl>
  * <dt><b>Styles:</b></dt>
- * <dd>SINGLE, MULTI, CHECK, FULL_SELECTION, HIDE_SELECTION, VIRTUAL, NO_SCROLL</dd>
+ * <dd>SINGLE, MULTI, CHECK, FULL_SELECTION, HIDE_SELECTION, VIRTUAL, NO_SCROLL, NO_SEARCH</dd>
  * <dt><b>Events:</b></dt>
  * <dd>Selection, DefaultSelection, SetData, MeasureItem, EraseItem, PaintItem</dd>
  * </dl>
@@ -3247,8 +3247,8 @@ void reskinChildren (int flags) {
 }
 
 boolean searchEnabled () {
-	/* Disable searching when using VIRTUAL */
-	if ((style & SWT.VIRTUAL) != 0) return false;
+	/* Disable searching when using VIRTUAL or NO_SEARCH */
+	if ((style & SWT.VIRTUAL) != 0 || (style & SWT.NO_SEARCH) != 0) return false;
 	return true;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
@@ -67,7 +67,7 @@
  * </p>
  * <dl>
  * <dt><b>Styles:</b></dt>
- * <dd>SINGLE, MULTI, CHECK, FULL_SELECTION, VIRTUAL, NO_SCROLL</dd>
+ * <dd>SINGLE, MULTI, CHECK, FULL_SELECTION, VIRTUAL, NO_SCROLL, NO_SEARCH</dd>
  * <dt><b>Events:</b></dt>
  * <dd>Selection, DefaultSelection, Collapse, Expand, SetData, MeasureItem, EraseItem, PaintItem, EmptinessChanged</dd>
  * </dl>
@@ -3449,8 +3449,8 @@ void reskinChildren (int flags) {
 	super.reskinChildren (flags);
 }
 boolean searchEnabled () {
-	/* Disable searching when using VIRTUAL */
-	if ((style & SWT.VIRTUAL) != 0) return false;
+	/* Disable searching when using VIRTUAL or NO_SEARCH */
+	if ((style & SWT.VIRTUAL) != 0 || (style & SWT.NO_SEARCH) != 0) return false;
 	return true;
 }
 /**
