@@ -1675,7 +1675,7 @@ def motion_notify_event(self, _item, _target, event):
1675
1675
# start drag when cursor moved more then 5
1676
1676
# to separate it from simple click
1677
1677
if ((abs (self ._last_x - event .x ) > 5 )
1678
- or (abs (self ._last_x - event .x ) > 5 )):
1678
+ or (abs (self ._last_y - event .y ) > 5 )):
1679
1679
self .uistate .set_busy_cursor (False )
1680
1680
# Remove all single click events
1681
1681
for click_item in self .click_events :
@@ -1692,15 +1692,12 @@ def motion_notify_event(self, _item, _target, event):
1692
1692
y = ((height_canvas + self ._last_y ) * scale_coef -
1693
1693
self .vadjustment .get_value ())
1694
1694
1695
- context = drag_widget .drag_begin_with_coordinates (
1695
+ drag_widget .drag_begin_with_coordinates (
1696
1696
drag_widget .drag_source_get_target_list (),
1697
1697
Gdk .DragAction .COPY ,
1698
1698
Gdk .ModifierType .BUTTON1_MASK ,
1699
1699
event ,
1700
1700
x , y )
1701
- # set icon for person drag
1702
- Gtk .drag_set_icon_name (context , 'gramps-person' , 0 , 0 )
1703
-
1704
1701
return True
1705
1702
return False
1706
1703
@@ -1782,13 +1779,14 @@ def select_node(self, item, target, event):
1782
1779
1783
1780
return True
1784
1781
1785
- def cb_drag_begin (self , widget , data ):
1782
+ def cb_drag_begin (self , widget , context ):
1786
1783
"""
1787
1784
Called on start drag.
1788
1785
"""
1789
- self ._in_drag = True
1786
+ # set icon for person drag
1787
+ Gtk .drag_set_icon_name (context , 'gramps-person' , 0 , 0 )
1790
1788
1791
- def cb_drag_end (self , widget , data ):
1789
+ def cb_drag_end (self , widget , context ):
1792
1790
"""
1793
1791
Called when drag is end.
1794
1792
"""
@@ -1802,7 +1800,7 @@ def cb_drag_data_get(self, widget, context, sel_data, info, time):
1802
1800
tgs = [x .name () for x in context .list_targets ()]
1803
1801
if info == DdTargets .PERSON_LINK .app_id :
1804
1802
data = (DdTargets .PERSON_LINK .drag_type ,
1805
- id (self ), self .drag_person .handle , 0 )
1803
+ id (widget ), self .drag_person .handle , 0 )
1806
1804
sel_data .set (sel_data .get_target (), 8 , pickle .dumps (data ))
1807
1805
elif ('TEXT' in tgs or 'text/plain' in tgs ) and info == 0 :
1808
1806
format_helper = FormattingHelper (self .dbstate )
0 commit comments