i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BOutlineListView: Refactor to eliminate repeat vars

Browse Source 
The latch width, height and indent width are now all set in one
place in LatchRect() and then LatchRect() is used in multiple places.
This commit is contained in:
John Scipione
2013-05-02 20:13:55 -04:00
parent f56bf5b03e
commit a56ddb2bea
1 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/OutlineListView.cpp
+15 -18
View File
@@ -880,10 +880,14 @@ BOutlineListView::ExpandOrCollapse(BListItem* item, bool expand)
BRect BRect
BOutlineListView::LatchRect(BRect itemRect, int32 level) const BOutlineListView::LatchRect(BRect itemRect, int32 level) const
{ {
float latchDimension = be_plain_font->Size(); float latchWidth = be_plain_font->Size();
float indentWidth = be_control_look->DefaultItemSpacing(); float latchHeight = be_plain_font->Size();
return BRect(itemRect.left, itemRect.top, itemRect.left float indentOffset = level * be_control_look->DefaultItemSpacing();
+ latchDimension + level * indentWidth, itemRect.bottom); float heightOffset = itemRect.Height() / 2 - latchHeight / 2;
return BRect(0, 0, latchWidth, latchHeight)
.OffsetBySelf(itemRect.left, itemRect.top)
.OffsetBySelf(indentOffset, heightOffset);
} }
@@ -891,19 +895,12 @@ void
BOutlineListView::DrawLatch(BRect itemRect, int32 level, bool collapsed, BOutlineListView::DrawLatch(BRect itemRect, int32 level, bool collapsed,
bool highlighted, bool misTracked) bool highlighted, bool misTracked)
{ {
float latchDimension = be_plain_font->Size(); BRect latchRect(LatchRect(itemRect, level));
float indentWidth = be_control_look->DefaultItemSpacing();
BPoint itemLoc(itemRect.LeftTop());
float latchOffset = itemRect.Height() / 2 - latchDimension / 2;
BRect rect = BRect(0, 0, latchDimension, latchDimension)
.OffsetBySelf(itemLoc.x, itemLoc.y + latchOffset)
.OffsetBySelf(level * indentWidth, 0);
rgb_color base = ui_color(B_PANEL_BACKGROUND_COLOR); rgb_color base = ui_color(B_PANEL_BACKGROUND_COLOR);
int32 arrowDirection = collapsed ? BControlLook::B_RIGHT_ARROW int32 arrowDirection = collapsed ? BControlLook::B_RIGHT_ARROW
: BControlLook::B_DOWN_ARROW; : BControlLook::B_DOWN_ARROW;
be_control_look->DrawArrowShape(this, rect, rect, base, be_control_look->DrawArrowShape(this, latchRect, itemRect, base,
arrowDirection, 0, B_DARKEN_4_TINT); arrowDirection, 0, B_DARKEN_4_TINT);
} }
@@ -911,12 +908,12 @@ BOutlineListView::DrawLatch(BRect itemRect, int32 level, bool collapsed,
void void
BOutlineListView::DrawItem(BListItem* item, BRect itemRect, bool complete) BOutlineListView::DrawItem(BListItem* item, BRect itemRect, bool complete)
{ {
if (item->fHasSubitems) if (item->fHasSubitems) {
DrawLatch(itemRect, item->fLevel, !item->IsExpanded(), false, false); DrawLatch(itemRect, item->fLevel, !item->IsExpanded(),
item->IsSelected() || complete, false);
}
float latchDimension = be_plain_font->Size(); itemRect.left += LatchRect(itemRect, item->fLevel).right;
float indentWidth = be_control_look->DefaultItemSpacing();
itemRect.left += latchDimension + item->fLevel * indentWidth;
item->DrawItem(this, itemRect, complete); item->DrawItem(this, itemRect, complete);
} }