callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

send signals even if the row/col is -1. (et_drag_drop): same.

Browse Source 
2001-06-28  Chris Toshok  <toshok@ximian.com>

	* e-table.c (et_drag_motion): send signals even if the row/col is
	-1.
	(et_drag_drop): same.

	* e-tree.c (et_drag_motion): same.
	(et_drag_drop): same.

svn path=/trunk/; revision=10584
This commit is contained in:
Chris Toshok
2001-06-29 03:09:48 +00:00
committed by Chris Toshok
parent 9b087b2497
commit a7d41cc36e
2 changed files with 56 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
widgets/table/e-table.c
View File

@ -1912,8 +1912,7 @@ et_drag_motion(GtkWidget *widget,
e_table_get_cell_at (et, x, y, &row, &col);
if (et->drop_row >= 0 && et->drop_col >= 0 &&
row != et->drop_row && col != et->drop_row) {
if (row != et->drop_row && col != et->drop_row) {
gtk_signal_emit (GTK_OBJECT (et),
et_signals [TABLE_DRAG_LEAVE],
et->drop_row,
@ -1923,16 +1922,15 @@ et_drag_motion(GtkWidget *widget,
}
et->drop_row = row;
et->drop_col = col;
if (row >= 0 && col >= 0)
gtk_signal_emit (GTK_OBJECT (et),
et_signals [TABLE_DRAG_MOTION],
et->drop_row,
et->drop_col,
context,
x,
y,
time,
&ret_val);
gtk_signal_emit (GTK_OBJECT (et),
et_signals [TABLE_DRAG_MOTION],
et->drop_row,
et->drop_col,
context,
x,
y,
time,
&ret_val);
return ret_val;
}
@ -1949,37 +1947,34 @@ et_drag_drop(GtkWidget *widget,
e_table_get_cell_at (et, x, y, &row, &col);
if (et->drop_row >= 0 && et->drop_col >= 0 &&
row != et->drop_row && col != et->drop_row) {
if (row != et->drop_row && col != et->drop_row) {
gtk_signal_emit (GTK_OBJECT (et),
et_signals [TABLE_DRAG_LEAVE],
et->drop_row,
et->drop_col,
context,
time);
if (row >= 0 && col >= 0)
gtk_signal_emit (GTK_OBJECT (et),
et_signals [TABLE_DRAG_MOTION],
row,
col,
context,
x,
y,
time,
&ret_val);
}
et->drop_row = row;
et->drop_col = col;
if (row >= 0 && col >= 0)
gtk_signal_emit (GTK_OBJECT (et),
et_signals [TABLE_DRAG_DROP],
et->drop_row,
et->drop_col,
et_signals [TABLE_DRAG_MOTION],
row,
col,
context,
x,
y,
time,
&ret_val);
}
et->drop_row = row;
et->drop_col = col;
gtk_signal_emit (GTK_OBJECT (et),
et_signals [TABLE_DRAG_DROP],
et->drop_row,
et->drop_col,
context,
x,
y,
time,
&ret_val);
et->drop_row = -1;
et->drop_col = -1;
return ret_val;

65
widgets/table/e-tree.c
View File

@ -1915,8 +1915,7 @@ et_drag_motion(GtkWidget *widget,
y,
&row,
&col);
if (et->priv->drop_row >= 0 && et->priv->drop_col >= 0 &&
row != et->priv->drop_row && col != et->priv->drop_row) {
if (row != et->priv->drop_row && col != et->priv->drop_row) {
gtk_signal_emit (GTK_OBJECT (et),
et_signals [TREE_DRAG_LEAVE],
et->priv->drop_row,
@ -1932,17 +1931,16 @@ et_drag_motion(GtkWidget *widget,
et->priv->drop_row = row;
et->priv->drop_path = path;
et->priv->drop_col = col;
if (row >= 0 && col >= 0)
gtk_signal_emit (GTK_OBJECT (et),
et_signals [TREE_DRAG_MOTION],
et->priv->drop_row,
et->priv->drop_path,
et->priv->drop_col,
context,
x,
y,
time,
&ret_val);
gtk_signal_emit (GTK_OBJECT (et),
et_signals [TREE_DRAG_MOTION],
et->priv->drop_row,
et->priv->drop_path,
et->priv->drop_col,
context,
x,
y,
time,
&ret_val);
return ret_val;
}
@ -1965,8 +1963,7 @@ et_drag_drop(GtkWidget *widget,
path = e_tree_table_adapter_node_at_row(et->priv->etta, row);
path = e_tree_sorted_view_to_model_path(et->priv->sorted, path);
if (et->priv->drop_row >= 0 && et->priv->drop_col >= 0 &&
row != et->priv->drop_row && col != et->priv->drop_row) {
if (row != et->priv->drop_row && col != et->priv->drop_row) {
gtk_signal_emit (GTK_OBJECT (et),
et_signals [TREE_DRAG_LEAVE],
et->priv->drop_row,
@ -1974,32 +1971,30 @@ et_drag_drop(GtkWidget *widget,
et->priv->drop_col,
context,
time);
if (row >= 0 && col >= 0)
gtk_signal_emit (GTK_OBJECT (et),
et_signals [TREE_DRAG_MOTION],
row,
path,
col,
context,
x,
y,
time,
&ret_val);
}
et->priv->drop_row = row;
et->priv->drop_path = path;
et->priv->drop_col = col;
if (row >= 0 && col >= 0)
gtk_signal_emit (GTK_OBJECT (et),
et_signals [TREE_DRAG_DROP],
et->priv->drop_row,
et->priv->drop_path,
et->priv->drop_col,
et_signals [TREE_DRAG_MOTION],
row,
path,
col,
context,
x,
y,
time,
&ret_val);
}
et->priv->drop_row = row;
et->priv->drop_path = path;
et->priv->drop_col = col;
gtk_signal_emit (GTK_OBJECT (et),
et_signals [TREE_DRAG_DROP],
et->priv->drop_row,
et->priv->drop_path,
et->priv->drop_col,
context,
x,
y,
time,
&ret_val);
et->priv->drop_row = -1;
et->priv->drop_path = NULL;
et->priv->drop_col = -1;