[haiku-commits] r33760 - haiku/trunk/src/kits/interface
- From: axeld@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 25 Oct 2009 15:51:39 +0100 (CET)
Author: axeld
Date: 2009-10-25 15:51:39 +0100 (Sun, 25 Oct 2009)
New Revision: 33760
Changeset: http://dev.haiku-os.org/changeset/33760/haiku
Modified:
haiku/trunk/src/kits/interface/OutlineListView.cpp
Log:
* Expand(), and Collapse() aren't supposed to do the work themselves.
* Instead, they should call the protected virtual ExpandOrCollapse(), this makes
one of my apps work again under Haiku (where the list view contents are
filled on demand).
Modified: haiku/trunk/src/kits/interface/OutlineListView.cpp
===================================================================
--- haiku/trunk/src/kits/interface/OutlineListView.cpp 2009-10-25 13:59:05 UTC
(rev 33759)
+++ haiku/trunk/src/kits/interface/OutlineListView.cpp 2009-10-25 14:51:39 UTC
(rev 33760)
@@ -193,7 +193,7 @@
{
BListItem* item = ItemAt(currentSel);
if (item && item->fHasSubitems) {
- if (!IsExpanded(currentSel))
+ if (!IsExpanded(currentSel))
Expand(item);
else
Select(currentSel + 1);
@@ -480,108 +480,14 @@
void
BOutlineListView::Expand(BListItem* item)
{
- if (item->IsExpanded() || !FullListHasItem(item))
- return;
-
- item->fExpanded = true;
-
- uint32 level = item->fLevel;
- int32 fullIndex = FullListIndexOf(item);
- int32 index = IndexOf(item) + 1;
- int32 startIndex = index;
- int32 count = FullListCountItems() - fullIndex - 1;
- BListItem** items = (BListItem**)fFullList.Items() + fullIndex + 1;
-
- BFont font;
- GetFont(&font);
- while (count-- > 0) {
- item = items[0];
- if (item->fLevel <= level)
- break;
-
- if (!item->IsItemVisible()) {
- // fix selection hints
- if (index <= fFirstSelected)
- fFirstSelected++;
- if (index <= fLastSelected)
- fLastSelected++;
-
- fList.AddItem(item, index++);
- item->Update(this, &font);
- item->SetItemVisible(true);
- }
-
- if (item->HasSubitems() && !item->IsExpanded()) {
- // Skip hidden children
- uint32 subLevel = item->fLevel;
- items++;
-
- while (--count > 0 && items[0]->fLevel > subLevel)
- items++;
- } else
- items++;
- }
- _RecalcItemTops(startIndex);
- _FixupScrollBar();
- Invalidate();
+ ExpandOrCollapse(item, true);
}
void
BOutlineListView::Collapse(BListItem* item)
{
- if (!item->IsExpanded() || !FullListHasItem(item))
- return;
-
- item->fExpanded = false;
-
- uint32 level = item->fLevel;
- int32 fullIndex = FullListIndexOf(item);
- int32 index = IndexOf(item);
- int32 startIndex = index;
- int32 max = FullListCountItems() - fullIndex - 1;
- int32 count = 0;
- bool selectionChanged = false;
-
- BListItem** items = (BListItem**)fFullList.Items() + fullIndex + 1;
-
- while (max-- > 0) {
- item = items[0];
- if (item->fLevel <= level)
- break;
-
- if (item->IsItemVisible()) {
- fList.RemoveItem(item);
- item->SetItemVisible(false);
- if (item->IsSelected()) {
- selectionChanged = true;
- item->Deselect();
- }
- count++;
- }
-
- items++;
- }
-
- _RecalcItemTops(startIndex);
- // fix selection hints
- if (index < fFirstSelected && index + count < fFirstSelected) {
- // all items removed were higher than the selection range,
- // adjust the indexes to correspond to their new visible
positions
- fFirstSelected -= count;
- fLastSelected -= count;
- }
-
- int32 maxIndex = fList.CountItems() - 1;
- if (fFirstSelected > maxIndex)
- fFirstSelected = maxIndex;
- if (fLastSelected > maxIndex)
- fLastSelected = maxIndex;
- if (selectionChanged)
- SelectionChanged();
-
- _FixupScrollBar();
- Invalidate();
+ ExpandOrCollapse(item, false);
}
@@ -869,8 +775,103 @@
void
-BOutlineListView::ExpandOrCollapse(BListItem* underItem, bool expand)
+BOutlineListView::ExpandOrCollapse(BListItem* item, bool expand)
{
+ if (item->IsExpanded() == expand || !FullListHasItem(item))
+ return;
+
+ item->fExpanded = expand;
+
+ // TODO: merge these cases together, they are pretty similar
+
+ if (expand) {
+ uint32 level = item->fLevel;
+ int32 fullIndex = FullListIndexOf(item);
+ int32 index = IndexOf(item) + 1;
+ int32 startIndex = index;
+ int32 count = FullListCountItems() - fullIndex - 1;
+ BListItem** items = (BListItem**)fFullList.Items() + fullIndex
+ 1;
+
+ BFont font;
+ GetFont(&font);
+ while (count-- > 0) {
+ item = items[0];
+ if (item->fLevel <= level)
+ break;
+
+ if (!item->IsItemVisible()) {
+ // fix selection hints
+ if (index <= fFirstSelected)
+ fFirstSelected++;
+ if (index <= fLastSelected)
+ fLastSelected++;
+
+ fList.AddItem(item, index++);
+ item->Update(this, &font);
+ item->SetItemVisible(true);
+ }
+
+ if (item->HasSubitems() && !item->IsExpanded()) {
+ // Skip hidden children
+ uint32 subLevel = item->fLevel;
+ items++;
+
+ while (--count > 0 && items[0]->fLevel >
subLevel)
+ items++;
+ } else
+ items++;
+ }
+ _RecalcItemTops(startIndex);
+ } else {
+ // collapse
+ uint32 level = item->fLevel;
+ int32 fullIndex = FullListIndexOf(item);
+ int32 index = IndexOf(item);
+ int32 startIndex = index;
+ int32 max = FullListCountItems() - fullIndex - 1;
+ int32 count = 0;
+ bool selectionChanged = false;
+
+ BListItem** items = (BListItem**)fFullList.Items() + fullIndex
+ 1;
+
+ while (max-- > 0) {
+ item = items[0];
+ if (item->fLevel <= level)
+ break;
+
+ if (item->IsItemVisible()) {
+ fList.RemoveItem(item);
+ item->SetItemVisible(false);
+ if (item->IsSelected()) {
+ selectionChanged = true;
+ item->Deselect();
+ }
+ count++;
+ }
+
+ items++;
+ }
+
+ _RecalcItemTops(startIndex);
+ // fix selection hints
+ if (index < fFirstSelected && index + count < fFirstSelected) {
+ // all items removed were higher than the selection
range,
+ // adjust the indexes to correspond to their new
visible positions
+ fFirstSelected -= count;
+ fLastSelected -= count;
+ }
+
+ int32 maxIndex = fList.CountItems() - 1;
+ if (fFirstSelected > maxIndex)
+ fFirstSelected = maxIndex;
+ if (fLastSelected > maxIndex)
+ fLastSelected = maxIndex;
+ if (selectionChanged)
+ SelectionChanged();
+ }
+
+ _FixupScrollBar();
+ Invalidate();
}
@@ -893,7 +894,7 @@
if (collapsed) {
SetHighColor(192, 192, 192);
- FillTriangle(itemRect.LeftTop() + BPoint(left + 4.0f,
+ FillTriangle(itemRect.LeftTop() + BPoint(left + 4.0f,
halfHeight - kLatchHeight / 2.0f),
itemRect.LeftTop() + BPoint(left + 4.0f,
halfHeight + kLatchHeight / 2.0f),
Other related posts:
- » [haiku-commits] r33760 - haiku/trunk/src/kits/interface - axeld
