nemo-icon-container.c: Clean up interactive-search positioning

function.

This is only used in nemo-desktop windows now - all other views
use the filter-bar approach.

Disable interactive search in the sidebar also - focus is forced
on the active view after location changes now, so the filter-bar
can be invoked naturally.

Author: mtwebster

libnemo-private/nemo-icon-container.c

@@ -3594,75 +3594,52 @@ static void
 nemo_icon_container_search_position_func (NemoIconContainer *container,
 					      GtkWidget *search_dialog)
 {
-	gint x, y;
-	gint cont_x, cont_y;
-	gint cont_width, cont_height;
-	GdkWindow *cont_window;
-	GtkRequisition requisition;
-	gint monitor_num;
-	GdkRectangle monitor;
-
-	cont_window = gtk_widget_get_window (GTK_WIDGET (container));
-
-    monitor_num = nemo_desktop_utils_get_monitor_for_widget (GTK_WIDGET (container));
-
-    /* FIXME?? _NET_WORKAREA hint only provides accurate workarea geometry for the
-     * primary monitor. Non-primary will return the full monitor geometry instead.
+    gint x, y;
+    gint cont_x, cont_y;
+    gint cont_width, cont_height;
+    GdkWindow *cont_window;
+    GtkRequisition requisition;
+
+    /* Desktop containers only: every other container forwards keypresses to the
+     * filter bar rather than starting an interactive search, so nothing else
+     * reaches here - see nemo_icon_container_key_press_event ().
      */
-    nemo_desktop_utils_get_monitor_work_rect (monitor_num, &monitor);
+    cont_window = gtk_widget_get_window (GTK_WIDGET (container));
 
-	gtk_widget_realize (search_dialog);
+    gtk_widget_realize (search_dialog);
 
     gdk_window_get_origin (cont_window, &cont_x, &cont_y);
     cont_width = gdk_window_get_width (cont_window);
     cont_height = gdk_window_get_height (cont_window);
 
-	gtk_widget_get_preferred_size (search_dialog, &requisition, NULL);
-
-    if (nemo_icon_container_get_is_desktop (container)) {
-        x = cont_x + cont_width - requisition.width;
-        y = cont_y + cont_height - requisition.height;
+    gtk_widget_get_preferred_size (search_dialog, &requisition, NULL);
 
-        if (eel_check_is_wayland ()) {
-            GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (container));
-            GdkWindow *parent_window = gtk_widget_get_window (toplevel);
-            gint parent_x, parent_y;
+    x = cont_x + cont_width - requisition.width;
+    y = cont_y + cont_height - requisition.height;
 
-            gdk_window_get_origin (parent_window, &parent_x, &parent_y);
+    if (eel_check_is_wayland ()) {
+        GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (container));
+        GdkWindow *parent_window = gtk_widget_get_window (toplevel);
+        gint parent_x, parent_y;
 
-            GdkRectangle anchor_rect = {
-                x - parent_x,
-                y - parent_y,
-                1, 1
-            };
+        gdk_window_get_origin (parent_window, &parent_x, &parent_y);
 
-            gdk_window_move_to_rect (gtk_widget_get_window (search_dialog),
-                                     &anchor_rect,
-                                     GDK_GRAVITY_NORTH_WEST,
-                                     GDK_GRAVITY_NORTH_WEST,
-                                     0,
-                                     0, 0);
-            return;
-        }
-    } else {
-        if (cont_x + cont_width > monitor.x + monitor.width) {
-            x = monitor.x + monitor.width - requisition.width;
-        } else if (cont_x + cont_width - requisition.width < 0) {
-            x = 0;
-        } else {
-            x = cont_x + cont_width - requisition.width;
-        }
+        GdkRectangle anchor_rect = {
+            x - parent_x,
+            y - parent_y,
+            1, 1
+        };
 
-        if (cont_y + cont_height + requisition.height > monitor.y + monitor.height) {
-            y = monitor.y + monitor.height - requisition.height;
-        } else if (cont_y + cont_height < 0) {
-            y = 0;
-        } else {
-            y = cont_y + cont_height;
-        }
+        gdk_window_move_to_rect (gtk_widget_get_window (search_dialog),
+                                 &anchor_rect,
+                                 GDK_GRAVITY_NORTH_WEST,
+                                 GDK_GRAVITY_NORTH_WEST,
+                                 0,
+                                 0, 0);
+        return;
     }
 
-	gdk_window_move (gtk_widget_get_window (search_dialog), x, y);
+    gdk_window_move (gtk_widget_get_window (search_dialog), x, y);
 }
 
 /* Cut and paste from gtkwindow.c */

src/nemo-places-sidebar.c

@@ -4332,7 +4332,11 @@ nemo_places_sidebar_init (NemoPlacesSidebar *sidebar)
 	gtk_widget_show (GTK_WIDGET (sidebar));
 	sidebar->tree_view = tree_view;
 
-	gtk_tree_view_set_search_column (tree_view, PLACES_SIDEBAR_COLUMN_NAME);
+    /* On by default, and its search window positions itself with absolute root
+     * coordinates - which a Wayland client cannot know, so it lands on the
+     * wrong monitor. */
+    gtk_tree_view_set_enable_search (tree_view, FALSE);
+
 	selection = gtk_tree_view_get_selection (tree_view);
 	gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);
 

src/nemo-tree-sidebar.c

@@ -1465,7 +1465,9 @@ create_tree (FMTreeView *view)
 		(gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (view->details->child_model)));
 	view->details->tree_widget = GTK_TREE_VIEW
 		(gtk_tree_view_new_with_model (GTK_TREE_MODEL (view->details->sort_model)));
-    gtk_tree_view_set_search_column (GTK_TREE_VIEW (view->details->tree_widget), FM_TREE_MODEL_DISPLAY_NAME_COLUMN);
+
+    /* See nemo-places-sidebar.c */
+    gtk_tree_view_set_enable_search (GTK_TREE_VIEW (view->details->tree_widget), FALSE);
 
 	g_object_unref (view->details->sort_model);