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

Deskbar: Fix build after merge.

This commit is contained in:
Augustin Cavalier 2020-02-19 12:22:39 -05:00
parent 15eb397e32
commit 0c9e6791d8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/apps/deskbar/BarView.cpp
View File

@ -1254,7 +1254,7 @@ TBarView::TeamMenuItemHeight() const
if (hideLabels && iconSize > B_MINI_ICON) { if (hideLabels && iconSize > B_MINI_ICON) {
// height is determined based solely on icon size // height is determined based solely on icon size
return iconSizePadded; return iconSizePadded;
} else if (!fVertical || fVertical && iconSize <= B_LARGE_ICON) { } else if (!fVertical || (fVertical && iconSize <= B_LARGE_ICON)) {
// horizontal or vertical with label on same row as icon: // horizontal or vertical with label on same row as icon:
// height based on icon size or font size, whichever is bigger // height based on icon size or font size, whichever is bigger
return std::max(iconSizePadded, labelHeight); return std::max(iconSizePadded, labelHeight);

2
src/apps/deskbar/TimeView.cpp
View File

@ -195,7 +195,7 @@ TTimeView::GetPreferredSize(float* width, float* height)
GetFontHeight(&fontHeight); GetFontHeight(&fontHeight);
fHeight = fontHeight.ascent + fontHeight.descent; fHeight = fontHeight.ascent + fontHeight.descent;
if (Vertical()) { if (fOrientation) {
float appWidth = static_cast<TBarApp*>(be_app)->Settings()->width; float appWidth = static_cast<TBarApp*>(be_app)->Settings()->width;
*width = fMaxWidth *width = fMaxWidth
= std::min(appWidth - (kDragRegionWidth + kHMargin) * 2, timeWidth); = std::min(appWidth - (kDragRegionWidth + kHMargin) * 2, timeWidth);