From 4bd225790a301c68d7a5df24617f071881d705b9 Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Sun, 9 Jul 2000 10:10:17 +0000 Subject: Don't draw drop markers when the layout won't be changed by the drop. svn path=/trunk/; revision=4005 --- widgets/e-table/ChangeLog | 5 +++++ widgets/e-table/e-table-header-item.c | 11 +++++++++-- widgets/table/e-table-header-item.c | 11 +++++++++-- 3 files changed, 23 insertions(+), 4 deletions(-) (limited to 'widgets') diff --git a/widgets/e-table/ChangeLog b/widgets/e-table/ChangeLog index a8d7790ecf..65a8c7c99e 100644 --- a/widgets/e-table/ChangeLog +++ b/widgets/e-table/ChangeLog @@ -1,3 +1,8 @@ +2000-07-09 Anders Carlsson + + * e-table-header-item.c (ethi_drag_motion): Don't draw drop + marker when the layout won't be changed by the drop. + 2000-07-08 Ettore Perazzoli * e-table-item.c (eti_table_model_changed): Removed an unused diff --git a/widgets/e-table/e-table-header-item.c b/widgets/e-table/e-table-header-item.c index 7851338c9e..bbad304182 100644 --- a/widgets/e-table/e-table-header-item.c +++ b/widgets/e-table/e-table-header-item.c @@ -474,8 +474,15 @@ ethi_drag_motion (GtkObject *canvas, GdkDragContext *context, int col; col = ethi_find_col_by_x_nearest (ethi, x); - - if (col != -1){ + + if (col == ethi->drag_col || col == ethi->drag_col + 1) { + if (ethi->drag_col != -1) + ethi_remove_destroy_marker (ethi); + + ethi_remove_drop_marker (ethi); + gdk_drag_status (context, context->suggested_action, time); + } + else if (col != -1){ if (ethi->drag_col != -1) ethi_remove_destroy_marker (ethi); diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c index 7851338c9e..bbad304182 100644 --- a/widgets/table/e-table-header-item.c +++ b/widgets/table/e-table-header-item.c @@ -474,8 +474,15 @@ ethi_drag_motion (GtkObject *canvas, GdkDragContext *context, int col; col = ethi_find_col_by_x_nearest (ethi, x); - - if (col != -1){ + + if (col == ethi->drag_col || col == ethi->drag_col + 1) { + if (ethi->drag_col != -1) + ethi_remove_destroy_marker (ethi); + + ethi_remove_drop_marker (ethi); + gdk_drag_status (context, context->suggested_action, time); + } + else if (col != -1){ if (ethi->drag_col != -1) ethi_remove_destroy_marker (ethi); -- cgit