[nautilus/antonioffix-menus-and-popovers: 16/26] list-view: Simplify rectangle for rename popovers

[António Fernandes <antoniof src gnome org>]

commit 5ba711d979b2644e5e40f019d77cf4a6cb160f22
Author: António Fernandes <antoniof gnome org>
Date:   Sun Jan 7 01:37:57 2018 +0000

    list-view: Simplify rectangle for rename popovers
    
    We force a rectangle with width=40 to avoid pointy popover
    arrows, then center it to the file name column.
    
    This will not work well when reusing this for context menus.
    
    Instead, use the file name cell's area as rectangle. It should
    have enough width anyway.

 src/nautilus-list-view.c | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)
---
diff --git a/src/nautilus-list-view.c b/src/nautilus-list-view.c
index a1f1c1b0a..eb17d2b37 100644
--- a/src/nautilus-list-view.c
+++ b/src/nautilus-list-view.c
@@ -60,12 +60,6 @@
 #define DEBUG_FLAG NAUTILUS_DEBUG_LIST_VIEW
 #include "nautilus-debug.h"
 
-/* We use a rectangle to make the popover point to the right column. In an
- * ideal world with GtkListBox we would just point to the GtkListBoxRow. In our case, we
- * need to use a rectangle and we provide some width to not make the popover arrow pointy
- * in the edges if the window is small */
-#define RENAME_POPOVER_RELATIVE_TO_RECTANGLE_WIDTH 40
-
 struct SelectionForeachData
 {
     GList *list;
@@ -3724,7 +3718,7 @@ nautilus_list_view_get_rectangle_for_popup (NautilusFilesView *view)
     model = GTK_TREE_MODEL (list_view->details->model);
     list = gtk_tree_selection_get_selected_rows (selection, &model);
     path = list->data;
-    gtk_tree_view_get_cell_area (tree_view, path, NULL, rect);
+    gtk_tree_view_get_cell_area (tree_view, path, list_view->details->file_name_column, rect);
     gtk_tree_view_convert_bin_window_to_widget_coords (tree_view,
                                                        rect->x, rect->y,
                                                        &rect->x, &rect->y);
@@ -3732,16 +3726,8 @@ nautilus_list_view_get_rectangle_for_popup (NautilusFilesView *view)
     if (list_view->details->last_event_button_x > 0)
     {
         rect->x = list_view->details->last_event_button_x;
+        rect->width = 0;
     }
-    else
-    {
-        rect->x = CLAMP (gtk_tree_view_column_get_width (list_view->details->file_name_column) * 0.5 -
-                         RENAME_POPOVER_RELATIVE_TO_RECTANGLE_WIDTH * 0.5,
-                         0,
-                         gtk_tree_view_column_get_width (list_view->details->file_name_column) -
-                         RENAME_POPOVER_RELATIVE_TO_RECTANGLE_WIDTH);
-    }
-    rect->width = RENAME_POPOVER_RELATIVE_TO_RECTANGLE_WIDTH;
 
     g_list_free_full (list, (GDestroyNotify) gtk_tree_path_free);