diff options
author | Ernestas Kulik <ernestask@gnome.org> | 2018-07-23 18:54:17 +0300 |
---|---|---|
committer | Ernestas Kulik <ekulik@redhat.com> | 2019-06-29 14:33:41 +0200 |
commit | c275a2e67d827deebd2b2225f00c51ed73b4157d (patch) | |
tree | 4bb4770dd21e8220a937b18bca63dde1278fa1a6 | |
parent | 66335d22a90f4237ecd99ee788be70a99a537427 (diff) | |
download | nautilus-c275a2e67d827deebd2b2225f00c51ed73b4157d.tar.gz |
files-view: Remove desktop leftovers
-rw-r--r-- | src/nautilus-canvas-container.c | 21 | ||||
-rw-r--r-- | src/nautilus-canvas-container.h | 2 | ||||
-rw-r--r-- | src/nautilus-canvas-view.c | 11 | ||||
-rw-r--r-- | src/nautilus-files-view.h | 9 |
4 files changed, 0 insertions, 43 deletions
diff --git a/src/nautilus-canvas-container.c b/src/nautilus-canvas-container.c index 40566c981..db91e84a3 100644 --- a/src/nautilus-canvas-container.c +++ b/src/nautilus-canvas-container.c @@ -6058,27 +6058,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 f8fd7f50c..8d4bcbf85 100644 --- a/src/nautilus-canvas-container.h +++ b/src/nautilus-canvas-container.h @@ -271,8 +271,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 451b97ba1..6d532f80f 100644 --- a/src/nautilus-canvas-view.c +++ b/src/nautilus-canvas-view.c @@ -971,16 +971,6 @@ nautilus_canvas_view_invert_selection (NautilusFilesView *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, NautilusCanvasView *canvas_view) @@ -1508,7 +1498,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. |