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

Tracker: Pose style fixes kind => which

Browse Source
This commit is contained in:
John Scipione 2014-07-15 00:44:27 -04:00
parent d5868b5976
commit f13a47d224
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -806,7 +806,7 @@ BPose::TestLargeIconPixel(BPoint point) const
void void
BPose::DrawIcon(BPoint where, BView* view, icon_size kind, bool direct, BPose::DrawIcon(BPoint where, BView* view, icon_size which, bool direct,
bool drawUnselected) bool drawUnselected)
{ {
if (fClipboardMode == kMoveSelectionTo) { if (fClipboardMode == kMoveSelectionTo) {
@ -818,16 +818,16 @@ BPose::DrawIcon(BPoint where, BView* view, icon_size kind, bool direct,
view->SetDrawingMode(B_OP_OVER); view->SetDrawingMode(B_OP_OVER);
IconCache::sIconCache->Draw(ResolvedModel(), view, where, IconCache::sIconCache->Draw(ResolvedModel(), view, where,
fIsSelected && !drawUnselected ? kSelectedIcon : kNormalIcon, kind, fIsSelected && !drawUnselected ? kSelectedIcon : kNormalIcon, which,
true); true);
if (fPercent != -1) if (fPercent != -1)
DrawBar(where, view, kind); DrawBar(where, view, which);
} }
void void
BPose::DrawBar(BPoint where, BView* view, icon_size kind) BPose::DrawBar(BPoint where, BView* view, icon_size which)
{ {
view->PushState(); view->PushState();
@ -835,9 +835,9 @@ BPose::DrawBar(BPoint where, BView* view, icon_size kind)
int32 barWidth; int32 barWidth;
int32 barHeight; int32 barHeight;
int32 yOffset; int32 yOffset;
if (kind >= B_LARGE_ICON) { if (which >= B_LARGE_ICON) {
size = kind - 1; size = which - 1;
barWidth = (int32)(7.0f / 32.0f * (float)kind); barWidth = (int32)(7.0f / 32.0f * (float)which);
yOffset = 2; yOffset = 2;
barHeight = size - 4 - 2 * yOffset; barHeight = size - 4 - 2 * yOffset;
} else { } else {

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

@ -75,9 +75,9 @@ public:
// special purpose draw call for deselecting over a textured // special purpose draw call for deselecting over a textured
// background // background
void DrawBar(BPoint where, BView* view, icon_size kind); void DrawBar(BPoint where, BView* view, icon_size which);
void DrawIcon(BPoint where, BView* view, icon_size kind, bool direct, void DrawIcon(BPoint where, BView* view, icon_size which, bool direct,
bool drawUnselected = false); bool drawUnselected = false);
void DrawToggleSwitch(BRect, BPoseView*); void DrawToggleSwitch(BRect, BPoseView*);
void MouseUp(BPoint poseLoc, BPoseView*, BPoint where, int32 index); void MouseUp(BPoint poseLoc, BPoseView*, BPoint where, int32 index);