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

servers/bluetooth: Fix scaling of deskbar icon

Browse Source 
Change-Id: Id83a1aeb9736be1d08ba10bb52ab81f2cab11625
Reviewed-on: https://review.haiku-os.org/c/haiku/+/4426
Reviewed-by: Alex von Gluck IV <kallisti5@unixzen.com>
Reviewed-by: Axel Dörfler <axeld@pinc-software.de>
Tested-by: Commit checker robot <no-reply+buildbot@haiku-os.org>
This commit is contained in:
Alexander von Gluck IV 2021-09-06 01:34:59 +00:00 committed by Axel Dörfler
parent 85ab8ef650
commit 08d9e48492
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/servers/bluetooth/DeskbarReplicant.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright 2009, Haiku, Inc. All Rights Reserved.
* Copyright 2009-2021, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
@ -24,7 +24,8 @@
#include <bluetoothserver_p.h>
extern "C" _EXPORT BView *instantiate_deskbar_item(void);
extern "C" _EXPORT BView *instantiate_deskbar_item(float maxWidth, float maxHeight);
status_t our_image(image_info& image);
const uint32 kMsgOpenBluetoothPreferences = 'obtp';
@ -43,7 +44,7 @@ const char* kClassName = "DeskbarReplicant";
DeskbarReplicant::DeskbarReplicant(BRect frame, int32 resizingMode)
: BView(frame, kDeskbarItemName, resizingMode,
B_WILL_DRAW | B_FRAME_EVENTS)
B_WILL_DRAW | B_TRANSPARENT_BACKGROUND | B_FRAME_EVENTS)
{
_Init();
}
@ -122,7 +123,10 @@ DeskbarReplicant::AttachedToWindow()
BView::AttachedToWindow();
AdoptParentColors();
SetLowColor(ViewColor());
if (ViewUIColor() == B_NO_COLOR)
SetLowColor(ViewColor());
else
SetLowUIColor(ViewUIColor());
}
@ -220,16 +224,18 @@ DeskbarReplicant::_ShowErrorAlert(BString msg, status_t status)
alert->Go(NULL);
}
// #pragma mark -
extern "C" _EXPORT BView *
instantiate_deskbar_item(void)
instantiate_deskbar_item(float maxWidth, float maxHeight)
{
return new DeskbarReplicant(BRect(0, 0, 15, 15),
B_FOLLOW_LEFT | B_FOLLOW_TOP);
return new DeskbarReplicant(BRect(0, 0, maxHeight - 1, maxHeight - 1),
B_FOLLOW_NONE);
}
// #pragma mark -