[nautilus/wip/ernestask/gtk4-continued: 1/50] files-view: Remove desktop leftovers



commit 6e0544956444a0c89ca03d8d881f09172aac198e
Author: Ernestas Kulik <ernestask gnome org>
Date:   Mon Jul 23 18:54:17 2018 +0300

    files-view: Remove desktop leftovers

 src/nautilus-canvas-container.c | 21 ---------------------
 src/nautilus-canvas-container.h |  2 --
 src/nautilus-canvas-view.c      | 11 -----------
 src/nautilus-files-view.h       |  9 ---------
 4 files changed, 43 deletions(-)
---
diff --git a/src/nautilus-canvas-container.c b/src/nautilus-canvas-container.c
index e4af0cb51..976cf1116 100644
--- a/src/nautilus-canvas-container.c
+++ b/src/nautilus-canvas-container.c
@@ -6070,27 +6070,6 @@ nautilus_canvas_container_accessible_select_all_selection (AtkSelection *accessi
     return TRUE;
 }
 
-void
-nautilus_canvas_container_widget_to_file_operation_position (NautilusCanvasContainer *container,
-                                                             GdkPoint                *position)
-{
-    double x, y;
-
-    g_return_if_fail (position != NULL);
-
-    x = position->x;
-    y = position->y;
-
-    eel_canvas_window_to_world (EEL_CANVAS (container), x, y, &x, &y);
-
-    position->x = (int) x;
-    position->y = (int) y;
-
-    /* ensure that we end up in the middle of the icon */
-    position->x -= nautilus_canvas_container_get_icon_size_for_zoom_level (container->details->zoom_level) / 
2;
-    position->y -= nautilus_canvas_container_get_icon_size_for_zoom_level (container->details->zoom_level) / 
2;
-}
-
 static void
 nautilus_canvas_container_accessible_selection_interface_init (AtkSelectionIface *iface)
 {
diff --git a/src/nautilus-canvas-container.h b/src/nautilus-canvas-container.h
index 8c056b06c..721aa484a 100644
--- a/src/nautilus-canvas-container.h
+++ b/src/nautilus-canvas-container.h
@@ -274,8 +274,6 @@ gboolean      nautilus_canvas_container_is_layout_rtl                       
(NautilusCanvasContainer  *
 
 gboolean          nautilus_canvas_container_get_store_layout_timestamps   (NautilusCanvasContainer  
*container);
 
-void              nautilus_canvas_container_widget_to_file_operation_position (NautilusCanvasContainer 
*container,
-                                                                              GdkPoint              
*position);
 guint             nautilus_canvas_container_get_icon_size_for_zoom_level (NautilusCanvasZoomLevel 
zoom_level);
 
 #define CANVAS_WIDTH(container,allocation) (allocation.width           \
diff --git a/src/nautilus-canvas-view.c b/src/nautilus-canvas-view.c
index d0851c6e2..00f0b0810 100644
--- a/src/nautilus-canvas-view.c
+++ b/src/nautilus-canvas-view.c
@@ -970,16 +970,6 @@ nautilus_canvas_view_invert_selection (NautilusFilesView *view)
         (get_canvas_container (NAUTILUS_CANVAS_VIEW (view)));
 }
 
-static void
-nautilus_canvas_view_widget_to_file_operation_position (NautilusFilesView *view,
-                                                        GdkPoint          *position)
-{
-    g_assert (NAUTILUS_IS_CANVAS_VIEW (view));
-
-    nautilus_canvas_container_widget_to_file_operation_position
-        (get_canvas_container (NAUTILUS_CANVAS_VIEW (view)), position);
-}
-
 static void
 canvas_container_activate_callback (NautilusCanvasContainer *container,
                                     GList                   *file_list,
@@ -1519,7 +1509,6 @@ nautilus_canvas_view_class_init (NautilusCanvasViewClass *klass)
     nautilus_files_view_class->click_policy_changed = nautilus_canvas_view_click_policy_changed;
     nautilus_files_view_class->update_actions_state = nautilus_canvas_view_update_actions_state;
     nautilus_files_view_class->sort_directories_first_changed = 
nautilus_canvas_view_sort_directories_first_changed;
-    nautilus_files_view_class->widget_to_file_operation_position = 
nautilus_canvas_view_widget_to_file_operation_position;
     nautilus_files_view_class->get_view_id = nautilus_canvas_view_get_id;
     nautilus_files_view_class->get_first_visible_file = canvas_view_get_first_visible_file;
     nautilus_files_view_class->scroll_to_file = canvas_view_scroll_to_file;
diff --git a/src/nautilus-files-view.h b/src/nautilus-files-view.h
index db304b802..21440d42d 100644
--- a/src/nautilus-files-view.h
+++ b/src/nautilus-files-view.h
@@ -199,15 +199,6 @@ struct _NautilusFilesViewClass {
          */
         gboolean (* is_empty)                (NautilusFilesView *view);
 
-        /* convert *point from widget's coordinate system to a coordinate
-         * system used for specifying file operation positions, which is view-specific.
-         *
-         * This is used by the the icon view, which converts the screen position to a zoom
-         * level-independent coordinate system.
-         */
-        void (* widget_to_file_operation_position) (NautilusFilesView *view,
-                                                    GdkPoint     *position);
-
         /* Preference change callbacks, overridden by icon and list views.
          * Icon and list views respond by synchronizing to the new preference
          * values and forcing an update if appropriate.


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]