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

Deskbar: Scale leaf/team menu with bold font only

Browse Source 
Note that this only affects the leaf and team menu item icon size
as we do not actually display any bold text here and this does not
cause any menu text to display as bold anywhere in Deskbar.

The reason to use bold font is because the leaf/team menu is set
to the same height as the window tab and the window tab is bold.

Fixes #17913

Change-Id: I8fd23e30e9a28e6aa24b4726c73863b9d0370010
Reviewed-on: https://review.haiku-os.org/c/haiku/+/6297
Reviewed-by: waddlesplash <waddlesplash@gmail.com>
Tested-by: Automation <automation@haiku-os.org>
This commit is contained in:
John Scipione 2023-04-02 23:07:25 -04:00 committed by Adrien Destugues
parent 6781d35fcc
commit 863bf67d8d
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/apps/deskbar/BarMenuBar.cpp
View File

@ -112,6 +112,7 @@ TBarMenuBar::TBarMenuBar(BRect frame, const char* name, TBarView* barView)
fTeamIconSize(0)
{
SetItemMargins(0.0f, 0.0f, 0.0f, 0.0f);
SetFont(be_bold_font);
TDeskbarMenu* beMenu = new TDeskbarMenu(barView);
TBarWindow::SetDeskbarMenu(beMenu);
@ -121,12 +122,9 @@ TBarMenuBar::TBarMenuBar(BRect frame, const char* name, TBarView* barView)
const void* data = AppResSet()->FindResource(B_VECTOR_ICON_TYPE,
R_LeafLogoBitmap, &dataSize);
if (data != NULL) {
// Scale bitmap according to font size
float width = std::max(63.f, ceilf(63 * be_plain_font->Size() / 12.f));
// but limit by be_bold_font size
width = std::min(width, ceilf(63.f * be_bold_font->Size() / 12.f));
float height = std::max(22.f, ceilf(22 * be_plain_font->Size() / 12.f));
height = std::min(height, ceilf(22.f * be_bold_font->Size() / 12.f));
// seems valid, scale bitmap according to be_bold_font size
float width = std::max(63.f, ceilf(63 * be_bold_font->Size() / 12.f));
float height = std::max(22.f, ceilf(22 * be_bold_font->Size() / 12.f));
icon = new BBitmap(BRect(0, 0, width - 1, height - 1), B_RGBA32);
if (icon->InitCheck() != B_OK
|| BIconUtils::GetVectorIcon((const uint8*)data, dataSize, icon)
@ -344,11 +342,8 @@ TBarMenuBar::FetchTeamIcon()
}
if (fTeamIconData != NULL && fTeamIconSize > 0) {
// seems valid, scale bitmap according to font size
// seems valid, scale bitmap according to be_bold_font size
float iconHeight = std::max(kTeamIconBitmapHeight,
ceilf(kTeamIconBitmapHeight * be_plain_font->Size() / 12.f));
// but limit by be_bold_font_size
iconHeight = std::min(iconHeight,
ceilf(kTeamIconBitmapHeight * be_bold_font->Size() / 12.f));
BRect iconRect = BRect(0, 0, iconHeight, iconHeight);
iconRect.InsetBy(-1, -1);