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

Tracker: Fixed vertical list icon position. 

* Instead of drawing it at the bottom of the line, draw it in the
  middle of it.
This commit is contained in:
Axel Dörfler 2015-09-09 20:37:22 +02:00
parent bf5480299e
commit 46dd7d5077
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/kits/tracker/Pose.cpp
View File

@ -524,11 +524,7 @@ BPose::PointInPose(BPoint loc, const BPoseView* poseView, BPoint where,
*hitWidget = NULL;
// check intersection with icon
BRect rect;
rect.left = loc.x + kListOffset;
rect.right = rect.left + B_MINI_ICON;
rect.bottom = loc.y + poseView->ListElemHeight();
rect.top = rect.bottom - B_MINI_ICON;
BRect rect = _IconRect(poseView, loc);
if (rect.Contains(where))
return true;
@ -572,11 +568,7 @@ BPose::Draw(BRect rect, const BRect& updateRect, BPoseView* poseView,
ModelNodeLazyOpener modelOpener(fModel);
if (poseView->ViewMode() == kListMode) {
uint32 size = poseView->IconSizeInt();
BRect iconRect(rect);
iconRect.left += kListOffset;
iconRect.right = iconRect.left + size;
iconRect.top = iconRect.bottom - size;
BRect iconRect = _IconRect(poseView, rect.LeftTop());
if (updateRect.Intersects(iconRect)) {
iconRect.OffsetBy(offset);
DrawIcon(iconRect.LeftTop(), drawView, poseView->IconSize(),
@ -992,6 +984,19 @@ BPose::CalcRect(const BPoseView* poseView) const
}
BRect
BPose::_IconRect(const BPoseView* poseView, BPoint location) const
{
uint32 size = poseView->IconSizeInt();
BRect rect;
rect.left = location.x + kListOffset;
rect.right = rect.left + size;
rect.top = location.y + (poseView->ListElemHeight() - size) / 2.f;
rect.bottom = rect.top + size;
return rect;
}
#if DEBUG
void
BPose::PrintToStream()

2
src/kits/tracker/Pose.h
View File

@ -137,6 +137,8 @@ private:
void EditPreviousNextWidgetCommon(BPoseView* poseView, bool next);
void CreateWidgets(BPoseView*);
bool TestLargeIconPixel(BPoint) const;
BRect _IconRect(const BPoseView* poseView,
BPoint location) const;
Model* fModel;
BObjectList<BTextWidget> fWidgetList;