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

Tracker & desklink: Pass -1 to GetTrackerIcon for sizing.

Browse Source 
It can just deduce the size from the passed BBitmap if we do this.
Simplifies the code somewhat.
This commit is contained in:
Augustin Cavalier
2022-08-31 16:21:53 -04:00
parent e6ab6daf98
commit 72e4928f8a
2 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bin/desklink/DeskButton.cpp
+1 -1
View File
@@ -44,7 +44,7 @@ DeskButton::DeskButton(BRect frame, entry_ref* ref, const char* name,
fTitleList(titles) fTitleList(titles)
{ {
fSegments = new BBitmap(frame, B_RGBA32); fSegments = new BBitmap(frame, B_RGBA32);
BNodeInfo::GetTrackerIcon(&fRef, fSegments, (icon_size)(frame.IntegerWidth() + 1)); BNodeInfo::GetTrackerIcon(&fRef, fSegments, (icon_size)-1);
} }
src/kits/tracker/IconMenuItem.cpp
+3 -5
View File
@@ -281,11 +281,9 @@ IconMenuItem::IconMenuItem(const char* label, BMessage* message,
fWhich(which) fWhich(which)
{ {
if (nodeInfo != NULL) { if (nodeInfo != NULL) {
fDeviceIcon = new BBitmap(BRect(BPoint(0, 0), be_control_look->ComposeIconSize(which)), fDeviceIcon = new BBitmap(BRect(BPoint(0, 0),
kDefaultIconDepth); be_control_look->ComposeIconSize(which)), kDefaultIconDepth);
if (nodeInfo->GetTrackerIcon(fDeviceIcon, (icon_size)-1) != B_OK) {
const icon_size size = (icon_size)(fDeviceIcon->Bounds().IntegerWidth() + 1);
if (nodeInfo->GetTrackerIcon(fDeviceIcon, size) != B_OK) {
delete fDeviceIcon; delete fDeviceIcon;
fDeviceIcon = NULL; fDeviceIcon = NULL;
} }