diff --git a/src/kits/tracker/IconMenuItem.cpp b/src/kits/tracker/IconMenuItem.cpp
index 03dcee79dc..27a2c3c27e 100644
a
|
b
|
ModelMenuItem::DrawContent()
|
126 | 126 | { |
127 | 127 | if (fDrawText) { |
128 | 128 | BPoint drawPoint(ContentLocation()); |
129 | | drawPoint.x += 20 + (fExtraPad ? 6 : 0); |
| 129 | drawPoint.x += 36 + (fExtraPad ? 6 : 0); |
130 | 130 | if (fHeightDelta > 0) |
131 | 131 | drawPoint.y += ceil(fHeightDelta / 2); |
132 | 132 | Menu()->MovePenTo(drawPoint); |
… |
… |
ModelMenuItem::DrawIcon()
|
164 | 164 | // draw small icon, synchronously |
165 | 165 | if (IsEnabled()) { |
166 | 166 | IconCache::sIconCache->Draw(fModel.ResolveIfLink(), Menu(), where, |
167 | | kNormalIcon, B_MINI_ICON); |
| 167 | kNormalIcon, B_LARGE_ICON); |
168 | 168 | } else { |
169 | 169 | // dimmed, for now use a special blitter; icon cache should |
170 | 170 | // know how to blit one eventually |
171 | 171 | IconCache::sIconCache->SyncDraw(fModel.ResolveIfLink(), Menu(), where, |
172 | | kNormalIcon, B_MINI_ICON, DimmedIconBlitter); |
| 172 | kNormalIcon, B_LARGE_ICON, DimmedIconBlitter); |
173 | 173 | } |
174 | 174 | |
175 | 175 | Menu()->PopState(); |
… |
… |
void
|
180 | 180 | ModelMenuItem::GetContentSize(float* width, float* height) |
181 | 181 | { |
182 | 182 | _inherited::GetContentSize(width, height); |
183 | | fHeightDelta = 16 - *height; |
184 | | if (*height < 16) |
185 | | *height = 16; |
| 183 | fHeightDelta = 32 - *height; |
| 184 | if (*height < 32) |
| 185 | *height = 32; |
186 | 186 | *width = *width + 20 + (fExtraPad ? 18 : 0); |
187 | 187 | } |
188 | 188 | |
… |
… |
IconMenuItem::IconMenuItem(const char* label, BMessage* message,
|
281 | 281 | fDeviceIcon = new BBitmap(BRect(0, 0, which - 1, which - 1), |
282 | 282 | kDefaultIconDepth); |
283 | 283 | |
284 | | if (nodeInfo->GetTrackerIcon(fDeviceIcon, B_MINI_ICON) != B_OK) { |
| 284 | if (nodeInfo->GetTrackerIcon(fDeviceIcon, B_LARGE_ICON) != B_OK) { |
285 | 285 | delete fDeviceIcon; |
286 | 286 | fDeviceIcon = NULL; |
287 | 287 | } |
… |
… |
IconMenuItem::IconMenuItem(BMessage* data)
|
352 | 352 | PositionPassingMenuItem(data), |
353 | 353 | fDeviceIcon(NULL), |
354 | 354 | fHeightDelta(0), |
355 | | fWhich(B_MINI_ICON) |
| 355 | fWhich(B_LARGE_ICON) |
356 | 356 | { |
357 | 357 | if (data != NULL) { |
358 | | fWhich = (icon_size)data->GetInt32("_which", B_MINI_ICON); |
| 358 | fWhich = (icon_size)data->GetInt32("_which", B_LARGE_ICON); |
359 | 359 | |
360 | 360 | fDeviceIcon = new BBitmap(BRect(0, 0, fWhich - 1, fWhich - 1), |
361 | 361 | kDefaultIconDepth); |