aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--widgets/e-table/ChangeLog5
-rw-r--r--widgets/e-table/e-table-header-item.c28
-rw-r--r--widgets/table/e-table-header-item.c28
3 files changed, 30 insertions, 31 deletions
diff --git a/widgets/e-table/ChangeLog b/widgets/e-table/ChangeLog
index 7fa9b6dafd..e1b93253b2 100644
--- a/widgets/e-table/ChangeLog
+++ b/widgets/e-table/ChangeLog
@@ -1,6 +1,9 @@
2000-04-12 Miguel de Icaza <miguel@gnu.org>
- * e-table-header-item.c (ethi_end_resize): Reset resize_guide here.
+ * e-table-header-item.c (ethi_drag_motion): Remove test for
+ source. We will fix this later.
+
+ (ethi_end_resize): Reset resize_guide here.
2000-04-11 Miguel de Icaza <miguel@helixcode.com>
diff --git a/widgets/e-table/e-table-header-item.c b/widgets/e-table/e-table-header-item.c
index d39a1f81d9..7f7494787a 100644
--- a/widgets/e-table/e-table-header-item.c
+++ b/widgets/e-table/e-table-header-item.c
@@ -443,25 +443,23 @@ ethi_drag_motion (GtkObject *canvas, GdkDragContext *context,
return FALSE;
gdk_drag_status (context, 0, time);
- if (GTK_WIDGET(canvas) == gtk_drag_get_source_widget (context)) {
- if ((x >= ethi->x1) && (x <= (ethi->x1 + ethi->width)) &&
- (y >= ethi->y1) && (y <= (ethi->y1 + ethi->height))){
- int col;
-
- col = ethi_find_col_by_x (ethi, x);
-
- if (col != -1){
- ethi_remove_destroy_marker (ethi);
- ethi_add_drop_marker (ethi, col);
- gdk_drag_status (context, context->suggested_action, time);
- } else {
- ethi_remove_drop_marker (ethi);
- ethi_add_destroy_marker (ethi);
- }
+ if ((x >= ethi->x1) && (x <= (ethi->x1 + ethi->width)) &&
+ (y >= ethi->y1) && (y <= (ethi->y1 + ethi->height))){
+ int col;
+
+ col = ethi_find_col_by_x (ethi, x);
+
+ if (col != -1){
+ ethi_remove_destroy_marker (ethi);
+ ethi_add_drop_marker (ethi, col);
+ gdk_drag_status (context, context->suggested_action, time);
} else {
ethi_remove_drop_marker (ethi);
ethi_add_destroy_marker (ethi);
}
+ } else {
+ ethi_remove_drop_marker (ethi);
+ ethi_add_destroy_marker (ethi);
}
return TRUE;
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index d39a1f81d9..7f7494787a 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -443,25 +443,23 @@ ethi_drag_motion (GtkObject *canvas, GdkDragContext *context,
return FALSE;
gdk_drag_status (context, 0, time);
- if (GTK_WIDGET(canvas) == gtk_drag_get_source_widget (context)) {
- if ((x >= ethi->x1) && (x <= (ethi->x1 + ethi->width)) &&
- (y >= ethi->y1) && (y <= (ethi->y1 + ethi->height))){
- int col;
-
- col = ethi_find_col_by_x (ethi, x);
-
- if (col != -1){
- ethi_remove_destroy_marker (ethi);
- ethi_add_drop_marker (ethi, col);
- gdk_drag_status (context, context->suggested_action, time);
- } else {
- ethi_remove_drop_marker (ethi);
- ethi_add_destroy_marker (ethi);
- }
+ if ((x >= ethi->x1) && (x <= (ethi->x1 + ethi->width)) &&
+ (y >= ethi->y1) && (y <= (ethi->y1 + ethi->height))){
+ int col;
+
+ col = ethi_find_col_by_x (ethi, x);
+
+ if (col != -1){
+ ethi_remove_destroy_marker (ethi);
+ ethi_add_drop_marker (ethi, col);
+ gdk_drag_status (context, context->suggested_action, time);
} else {
ethi_remove_drop_marker (ethi);
ethi_add_destroy_marker (ethi);
}
+ } else {
+ ethi_remove_drop_marker (ethi);
+ ethi_add_destroy_marker (ethi);
}
return TRUE;