@@ -1371,7 +1371,7 @@ def motion_notify_event(self, item, target, event):
1371
1371
# start drag when cursor moved more then 5
1372
1372
# to separate it from simple click
1373
1373
if ((abs (self ._last_x - event .x ) > 5 )
1374
- or (abs (self ._last_x - event .x ) > 5 )):
1374
+ or (abs (self ._last_y - event .y ) > 5 )):
1375
1375
self .uistate .set_busy_cursor (False )
1376
1376
# Remove all single click events
1377
1377
for click_item in self .click_events :
@@ -1388,15 +1388,12 @@ def motion_notify_event(self, item, target, event):
1388
1388
y = ((height_canvas + self ._last_y ) * scale_coef -
1389
1389
self .vadjustment .get_value ())
1390
1390
1391
- context = drag_widget .drag_begin_with_coordinates (
1391
+ drag_widget .drag_begin_with_coordinates (
1392
1392
drag_widget .drag_source_get_target_list (),
1393
1393
Gdk .DragAction .COPY ,
1394
1394
Gdk .ModifierType .BUTTON1_MASK ,
1395
1395
event ,
1396
1396
x , y )
1397
- # set icon for person drag
1398
- Gtk .drag_set_icon_name (context , 'gramps-person' , 0 , 0 )
1399
-
1400
1397
return True
1401
1398
return False
1402
1399
@@ -1481,13 +1478,14 @@ def select_node(self, item, target, event):
1481
1478
1482
1479
return True
1483
1480
1484
- def cb_drag_begin (self , widget , data ):
1481
+ def cb_drag_begin (self , widget , context ):
1485
1482
"""
1486
1483
Called on start drag.
1487
1484
"""
1488
- self ._in_drag = True
1485
+ # set icon for person drag
1486
+ Gtk .drag_set_icon_name (context , 'gramps-person' , 0 , 0 )
1489
1487
1490
- def cb_drag_end (self , widget , data ):
1488
+ def cb_drag_end (self , widget , context ):
1491
1489
"""
1492
1490
Called when drag is end.
1493
1491
"""
@@ -1501,7 +1499,7 @@ def cb_drag_data_get(self, widget, context, sel_data, info, time):
1501
1499
tgs = [x .name () for x in context .list_targets ()]
1502
1500
if info == DdTargets .PERSON_LINK .app_id :
1503
1501
data = (DdTargets .PERSON_LINK .drag_type ,
1504
- id (self ), self .drag_person .handle , 0 )
1502
+ id (widget ), self .drag_person .handle , 0 )
1505
1503
sel_data .set (sel_data .get_target (), 8 , pickle .dumps (data ))
1506
1504
elif ('TEXT' in tgs or 'text/plain' in tgs ) and info == 0 :
1507
1505
format_helper = FormattingHelper (self .dbstate )
0 commit comments