Changeset 108 for Mulberry/trunk/Linux/Sources/Support/Table/CTableDragAndDrop.cp

Timestamp:

10/20/07 15:17:40 (1 year ago)

Author:

daboo

Message:

Fix for drag and drop cell offset issues when lists are scrolled.

Files:

• Mulberry/trunk/Linux/Sources/Support/Table/CTableDragAndDrop.cp (modified) (15 diffs)

Mulberry/trunk/Linux/Sources/Support/Table/CTableDragAndDrop.cp

@@ -268 +268 @@
 {
 
-  // Clear existing cell hilight
-  ClearDropCell(mDropCell);
+        // Clear existing cell hilight
+        ClearDropCell(mDropCell);
 
         // Cache the action for reference
@@ -292 +292 @@
                                 {
                                         STableCell dropCell;
-                                        JPoint imagePt;
-                                        LocalToImagePoint(pt, imagePt);
-                                        if (GetCellHitBy(imagePt, dropCell) && IsDropCell(mCurrentDropFlavors, dropCell))
+                                        if (GetCellHitBy(pt, dropCell) && IsDropCell(mCurrentDropFlavors, dropCell))
                                         {
                                                 if (mDropCursor)
@@ -300 +298 @@
                                                         // Check if close to edge of cell and drop cursor allowed
                                                         JRect rowRect;
-                                                        GetLocalCellRect(dropCell, rowRect);
+                                                        GetImageCellBounds(dropCell, rowRect);
                                                         
                                                         if ((pt.y < rowRect.top + 2) || (pt.y > rowRect.bottom - 2))
@@ -322 +320 @@
                                         // Get the hit cell
                                         STableCell      hitCell;
-                                        JPoint imagePt;
-                                        LocalToImagePoint(pt, imagePt);
-                                        GetCellHitBy(imagePt, hitCell);
+                                        GetCellHitBy(pt, hitCell);
 
                                         JRect rowRect;
-                                        GetLocalCellRect(hitCell, rowRect);
+                                        GetImageCellBounds(hitCell, rowRect);
 
                                         JPoint offset = pt;
@@ -333 +329 @@
 
                                         // Get the hit cell
-                                        LocalToImagePoint(offset, imagePt);
-                                        GetCellHitBy(imagePt, hitCell);
+                                        GetCellHitBy(offset, hitCell);
                                         
                                         if (mRows == 0)
@@ -377 +372 @@
 void CTableDragAndDrop::HandleDNDHere(const JPoint& pt, const JXWidget* source)
 {
-        JPoint  imagePt;
-        LocalToImagePoint(pt, imagePt);
-
         bool hilite = false;
         STableCell lastDrop = mLastDropCell;
@@ -388 +380 @@
                 // Get the hit cell
                 STableCell      hitCell;
-                GetCellHitBy(imagePt, hitCell);
+                GetCellHitBy(pt, hitCell);
                 mLastHitCell = hitCell;
 
@@ -398 +390 @@
                         // Check if close to edge of cell and drop cursor allowed
                         JRect rowRect;
-                        GetLocalCellRect(hitCell, rowRect);
+                        GetImageCellBounds(hitCell, rowRect);
                         
                         if ((pt.y < rowRect.top + 2) || (pt.y > rowRect.bottom - 2))
@@ -416 +408 @@
                 // Get the hit cell
                 STableCell      hitCell;
-                GetCellHitBy(imagePt, hitCell);
+                GetCellHitBy(pt, hitCell);
 
                 JRect rowRect;
-                GetLocalCellRect(hitCell, rowRect);
-
-                JPoint offset = imagePt;
+                GetImageCellBounds(hitCell, rowRect);
+
+                JPoint offset = pt;
                 offset += JPoint(0, rowRect.height()/2);
 
                 // Get the hit cell
-                GetCellHitBy(imagePt, hitCell);
+                GetCellHitBy(offset, hitCell);
                 
                 if (!hilite)
@@ -548 +540 @@
                 // Get row rect
                 JRect rowRect;
-                GetLocalCellRect(mLastDropCell, rowRect);
-
+                GetImageCellBounds(mLastDropCell, rowRect);
                 p->RectInside(rowRect); 
         }
@@ -558 +549 @@
                 // Get row rect
                 JRect rowRect;
-                GetLocalCellRect(cell, rowRect);
-
+                GetImageCellBounds(cell, rowRect);
                 p->RectInside(rowRect); 
         }
@@ -594 +584 @@
                 if (mLastDropCursor <= GetItemCount())
                 {
-                        GetLocalRowRect(mLastDropCursor.row, rowRect);
+                        GetImageCellBounds(mLastDropCursor.row, rowRect);
                         rowRect.bottom = rowRect.top + 2;
                 }
@@ -601 +591 @@
                         STableCell temp = mLastDropCursor;
                         temp.row--;
-                        GetLocalRowRect(temp.row, rowRect);
+                        GetImageCellBounds(temp.row, rowRect);
                         rowRect.top = rowRect.bottom - 2;
                 }
@@ -616 +606 @@
                 if (cell.row <= GetItemCount())
                 {
-                        GetLocalRowRect(cell.row, rowRect);
+                        GetImageCellBounds(cell.row, rowRect);
                         rowRect.bottom = rowRect.top + 2;
                 }
@@ -623 +613 @@
                         STableCell temp = cell;
                         temp.row--;
-                        GetLocalRowRect(temp.row, rowRect);
+                        GetImageCellBounds(temp.row, rowRect);
                         rowRect.top = rowRect.bottom - 2;
                 }