@@ -1462,7 +1462,7 @@ def motion_notify_event(self, _item, _target, event):
1462
1462
# start drag when cursor moved more then 5
1463
1463
# to separate it from simple click
1464
1464
if ((abs (self ._last_x - event .x ) > 5 )
1465
- or (abs (self ._last_x - event .x ) > 5 )):
1465
+ or (abs (self ._last_y - event .y ) > 5 )):
1466
1466
self .uistate .set_busy_cursor (False )
1467
1467
# Remove all single click events
1468
1468
for click_item in self .click_events :
@@ -1479,15 +1479,12 @@ def motion_notify_event(self, _item, _target, event):
1479
1479
y = ((height_canvas + self ._last_y ) * scale_coef -
1480
1480
self .vadjustment .get_value ())
1481
1481
1482
- context = drag_widget .drag_begin_with_coordinates (
1482
+ drag_widget .drag_begin_with_coordinates (
1483
1483
drag_widget .drag_source_get_target_list (),
1484
1484
Gdk .DragAction .COPY ,
1485
1485
Gdk .ModifierType .BUTTON1_MASK ,
1486
1486
event ,
1487
1487
x , y )
1488
- # set icon for person drag
1489
- Gtk .drag_set_icon_name (context , 'gramps-person' , 0 , 0 )
1490
-
1491
1488
return True
1492
1489
return False
1493
1490
@@ -1572,13 +1569,14 @@ def select_node(self, item, target, event):
1572
1569
1573
1570
return True
1574
1571
1575
- def cb_drag_begin (self , widget , data ):
1572
+ def cb_drag_begin (self , widget , context ):
1576
1573
"""
1577
1574
Called on start drag.
1578
1575
"""
1579
- self ._in_drag = True
1576
+ # set icon for person drag
1577
+ Gtk .drag_set_icon_name (context , 'gramps-person' , 0 , 0 )
1580
1578
1581
- def cb_drag_end (self , widget , data ):
1579
+ def cb_drag_end (self , widget , context ):
1582
1580
"""
1583
1581
Called when drag is end.
1584
1582
"""
@@ -1592,7 +1590,7 @@ def cb_drag_data_get(self, widget, context, sel_data, info, time):
1592
1590
tgs = [x .name () for x in context .list_targets ()]
1593
1591
if info == DdTargets .PERSON_LINK .app_id :
1594
1592
data = (DdTargets .PERSON_LINK .drag_type ,
1595
- id (self ), self .drag_person .handle , 0 )
1593
+ id (widget ), self .drag_person .handle , 0 )
1596
1594
sel_data .set (sel_data .get_target (), 8 , pickle .dumps (data ))
1597
1595
elif ('TEXT' in tgs or 'text/plain' in tgs ) and info == 0 :
1598
1596
format_helper = FormattingHelper (self .dbstate )
0 commit comments