Changeset 24139

Timestamp:

02/26/08 08:27:24 (9 months ago)

Author:

anevilyak

Message:

- Fix an error in SwapItems where the item tops would not be swapped
if the items were the same height.
- Modified _RecalcItemTops to allow us to specify a range instead of
just a starting point. This is useful for cases like Swap, where
only the items in between those being swapped need to be
recalculated.

Location:

haiku/trunk

Files:

• headers/os/interface/ListView.h (modified) (1 diff)
• src/kits/interface/ListView.cpp (modified) (3 diffs)

haiku/trunk/headers/os/interface/ListView.h

@@ -161 +161 @@
                                 int32           _CalcFirstSelected(int32 after);
                                 int32           _CalcLastSelected(int32 before);
-                                void            _RecalcItemTops(int32 start);
+                                void            _RecalcItemTops(int32 start, int32 end = -1);
                 virtual void            DrawItem(BListItem* item, BRect itemRect,
                                                                 bool complete = false);

haiku/trunk/src/kits/interface/ListView.cpp

@@ -1532 +1532 @@
         // NOTE: this is only important if the selection status
         // of both items is not the same
+        int32 first = min_c(a, b);
+        int32 last = max_c(a, b);
         if (ItemAt(a)->IsSelected() != ItemAt(b)->IsSelected()) {
-                int32 first = min_c(a, b);
-                int32 last = max_c(a, b);
-                if (first < fFirstSelected || last > fLastSelected) {
-                        first = min_c(first, fFirstSelected);
-                        last = max_c(last, fLastSelected);
-                        _RescanSelection(first, last);
-                }
+                if (first < fFirstSelected || last > fLastSelected) 
+                        _RescanSelection(min_c(first, fFirstSelected), min_c(last, fLastSelected));
                 // though the actually selected items stayed the
                 // same, the selection has still changed
@@ -1545 +1542 @@
         }
 
+        ItemAt(a)->SetTop(bFrame.top);
+        ItemAt(b)->SetTop(aFrame.top);
+        
         // take care of invalidation
         if (Window()) {
                 // NOTE: window looper is assumed to be locked!
                 if (aFrame.Height() != bFrame.Height()) {
-                        ItemAt(a)->SetTop(bFrame.top);
-                        ItemAt(b)->SetTop(aFrame.top);
+                        _RecalcItemTops(first, last);
                         // items in between shifted visually
                         Invalidate(aFrame | bFrame);
@@ -1677 +1676 @@
 
 void
-BListView::_RecalcItemTops(int32 start)
+BListView::_RecalcItemTops(int32 start, int32 end)
 {
         int32 count = CountItems();
         if ((start < 0) || (start >= count))
                 return;
+
+        if (end >= 0)
+                count = end + 1;
+
         float top = (start == 0) ? 0.0 : ItemAt(start - 1)->Bottom() + 1.0;
 
-        for (int32 i = start; i < CountItems(); i++) {
+        for (int32 i = start; i < count; i++) {
                 BListItem *item = ItemAt(i);
                 item->SetTop(top);