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

Deskbar: Correct sizing and placement of icons in window menus.

Browse Source 
Fixes #17891.
This commit is contained in:
Augustin Cavalier
2022-08-29 15:36:48 -04:00
parent 4f0d375c54
commit f34e3931e8
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/deskbar/WindowMenuItem.cpp
+11 -9
View File
@@ -159,21 +159,23 @@ TWindowMenuItem::DrawContent()
if (fID >= 0) { if (fID >= 0) {
menu->SetDrawingMode(B_OP_OVER); menu->SetDrawingMode(B_OP_OVER);
const float width = fBitmap->Bounds().Width(); const float bitmapWidth = fBitmap->Bounds().Width(),
if (width > 16) bitmapHeight = fBitmap->Bounds().Height();
contentLocation.x -= 8; float shiftedBy = 0.0f;
if (bitmapWidth > bitmapHeight) {
shiftedBy = (bitmapHeight + 1) / 2.0f;
contentLocation.x -= shiftedBy;
}
float height; float height;
GetContentSize(NULL, &height); GetContentSize(NULL, &height);
contentLocation.y += (height - fBitmap->Bounds().Height()) / 2; contentLocation.y += (height - bitmapHeight) / 2;
menu->MovePenTo(contentLocation); menu->MovePenTo(contentLocation);
menu->DrawBitmapAsync(fBitmap); menu->DrawBitmapAsync(fBitmap);
if (width > 16) contentLocation.x += shiftedBy;
contentLocation.x += 8; contentLocation.x += (bitmapWidth - shiftedBy) + sLabelOffset;
contentLocation.x += width + sLabelOffset;
} }
contentLocation.y = ContentLocation().y + sVPad + fLabelAscent; contentLocation.y = ContentLocation().y + sVPad + fLabelAscent;
@@ -261,7 +263,7 @@ TWindowMenuItem::_Init(const char* name)
{ {
if (sHPad == 0.0f) { if (sHPad == 0.0f) {
// Initialize the padding values. // Initialize the padding values.
sHPad = be_control_look->ComposeSpacing(B_USE_SMALL_SPACING); sHPad = be_control_look->ComposeSpacing(B_USE_ITEM_SPACING) - 1.0f;
sVPad = ceilf(be_control_look->ComposeSpacing(B_USE_SMALL_SPACING) / 4.0f); sVPad = ceilf(be_control_look->ComposeSpacing(B_USE_SMALL_SPACING) / 4.0f);
sLabelOffset = ceilf((be_control_look->DefaultLabelSpacing() / 3.0f) * 4.0f); sLabelOffset = ceilf((be_control_look->DefaultLabelSpacing() / 3.0f) * 4.0f);
} }