From b6e123ed0676b6d29eba3638af10a6f75a50139d Mon Sep 17 00:00:00 2001
From: Don Allingham <don@gramps-project.org>
Date: Thu, 4 Aug 2005 22:34:42 +0000
Subject: [PATCH] * src/ImageSelect.py: fixed thumbnail dnd selection

svn: r5018
---
 gramps2/ChangeLog          |  1 +
 gramps2/src/ImageSelect.py | 23 ++++++++++++-----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 0980609b4..b10be04a5 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,4 +1,5 @@
 2005-08-04  Don Allingham  <don@gramps-project.org>
+	* src/ImageSelect.py: fixed thumbnail dnd selection
 	* src/AttrEdit.py: don't used reserved word "list"
 	* src/EditPerson.py: Pass correct attribute list to editor
 	* src/GrampsBSDDB.py: persistently load/save attribute lists
diff --git a/gramps2/src/ImageSelect.py b/gramps2/src/ImageSelect.py
index dd4f8b6e9..cb97ac669 100644
--- a/gramps2/src/ImageSelect.py
+++ b/gramps2/src/ImageSelect.py
@@ -290,10 +290,18 @@ class Gallery(ImageSelect):
                                            int(event.x),int(event.y)):
                 self.drag_item = widget.get_item_at(self.remember_x,
                                                     self.remember_y)
-                icon_index = self.get_index(widget,event.x,event.y)-1
+                icon_index = self.get_index(widget,event.x,event.y)
                 if icon_index == -1:
                     return
+                for i in self.dataobj.get_media_list():
+                    handle = i.get_reference_handle()
+                    m = self.db.get_object_from_handle(handle)
+                
                 self.sel_obj = self.dataobj.get_media_list()[icon_index]
+
+                handle = self.sel_obj.get_reference_handle()
+                media_obj = self.db.get_object_from_handle(handle)
+                
                 if self.drag_item:
                     widget.drag_begin([DdTargets.MEDIAOBJ.target()]+_drag_targets,
                                       gtk.gdk.ACTION_COPY|gtk.gdk.ACTION_MOVE,
@@ -335,13 +343,6 @@ class Gallery(ImageSelect):
                 return True
         elif event.type == gtk.gdk.BUTTON_RELEASE:
             self.button = 0
-#         elif event.type == gtk.gdk._2BUTTON_PRESS and event.button == 1:
-#             item = widget.get_item_at(event.x,event.y)
-#             if item:
-#                 (i,t,b,self.photo,oid) = self.p_map[item]
-#                 LocalMediaProperties(self.photo,self.path,self,self.parent_window)
-#             self.in_event = 0
-#             return True
         elif event.type == gtk.gdk.MOTION_NOTIFY:
             if event.state & gtk.gdk.BUTTON1_MASK:
                 # Get the new position and move by the difference
@@ -460,9 +461,9 @@ class Gallery(ImageSelect):
             Utils.unbold_label(self.parent.gallery_label)
 
     def get_index(self,obj,x,y):
-        x_offset = x/(_IMAGEX+_PAD)
-        y_offset = y/(_IMAGEY+_PAD)
-        index = (y_offset*(1+self.max))+x_offset
+        x_offset = int(x)/(_IMAGEX+_PAD)
+        y_offset = int(y)/(_IMAGEY+_PAD)
+        index = (y_offset*(self.max))+x_offset
         return min(index,len(self.dataobj.get_media_list()))
 
     def on_photolist_drag_data_received(self,w, context, x, y, data, info, time):