Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more cleanup

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16490 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval 2006-02-21 11:33:15 +00:00
parent 09dec1db1b
commit 5d62b41983
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/kits/interface/ListView.cpp
View File

@ -849,8 +849,9 @@ BListView::DeselectAll()
return; return;
for (int32 index = fFirstSelected; index <= fLastSelected; index++) { for (int32 index = fFirstSelected; index <= fLastSelected; index++) {
if (ItemAt(index)->IsSelected()) { BListItem *item = ItemAt(index);
ItemAt(index)->Deselect(); if (item->IsSelected()) {
item->Deselect();
InvalidateItem(index); InvalidateItem(index);
} }
} }
@ -872,14 +873,16 @@ BListView::DeselectExcept(int32 start, int32 finish)
// TODO: check if the items from start to finish are // TODO: check if the items from start to finish are
// supposed to be selected if not already // supposed to be selected if not already
for (index = fFirstSelected; index < start; index++) { for (index = fFirstSelected; index < start; index++) {
if (ItemAt(index)->IsSelected()) { BListItem *item = ItemAt(index);
ItemAt(index)->Deselect(); if (item->IsSelected()) {
item->Deselect();
InvalidateItem(index); InvalidateItem(index);
} }
} }
for (index = finish + 1; index <= fLastSelected; index++) { for (index = finish + 1; index <= fLastSelected; index++) {
if (ItemAt(index)->IsSelected()) { BListItem *item = ItemAt(index);
ItemAt(index)->Deselect(); if (item->IsSelected()) {
item->Deselect();
InvalidateItem(index); InvalidateItem(index);
} }
} }
@ -1266,7 +1269,7 @@ BListView::_Select(int32 from, int32 to, bool extend)
for (int32 i = fFirstSelected; i <= fLastSelected; ++i) { for (int32 i = fFirstSelected; i <= fLastSelected; ++i) {
BListItem *item = ItemAt(i); BListItem *item = ItemAt(i);
if (item && item->IsSelected() && (i < from || i > to)) { if (item && item->IsSelected() && (i < from || i > to)) {
ItemAt(i)->Deselect(); item->Deselect();
InvalidateItem(i); InvalidateItem(i);
} }
} }
@ -1305,20 +1308,16 @@ BListView::_Deselect(int32 index)
BListItem *item = ItemAt(index); BListItem *item = ItemAt(index);
if (item->IsSelected()) if (item && item->IsSelected()) {
{
BRect frame(ItemFrame(index)); BRect frame(ItemFrame(index));
BRect bounds(Bounds()); BRect bounds(Bounds());
item->Deselect(); item->Deselect();
if (fFirstSelected == index && fLastSelected == index) if (fFirstSelected == index && fLastSelected == index) {
{
fFirstSelected = -1; fFirstSelected = -1;
fLastSelected = -1; fLastSelected = -1;
} } else {
else
{
if (fFirstSelected == index) if (fFirstSelected == index)
fFirstSelected = _CalcFirstSelected(index); fFirstSelected = _CalcFirstSelected(index);