From 0c9e6791d81b060570f14d80ce0703203be48f87 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Wed, 19 Feb 2020 12:22:39 -0500
Subject: [PATCH] Deskbar: Fix build after merge.

---
 src/apps/deskbar/BarView.cpp  | 2 +-
 src/apps/deskbar/TimeView.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/apps/deskbar/BarView.cpp b/src/apps/deskbar/BarView.cpp
index b6ebf8632d..347b1d768d 100644
--- a/src/apps/deskbar/BarView.cpp
+++ b/src/apps/deskbar/BarView.cpp
@@ -1254,7 +1254,7 @@ TBarView::TeamMenuItemHeight() const
 	if (hideLabels && iconSize > B_MINI_ICON) {
 		// height is determined based solely on icon size
 		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:
 		// height based on icon size or font size, whichever is bigger
 		return std::max(iconSizePadded, labelHeight);
diff --git a/src/apps/deskbar/TimeView.cpp b/src/apps/deskbar/TimeView.cpp
index 05c9aec551..3051b326c4 100644
--- a/src/apps/deskbar/TimeView.cpp
+++ b/src/apps/deskbar/TimeView.cpp
@@ -195,7 +195,7 @@ TTimeView::GetPreferredSize(float* width, float* height)
 	GetFontHeight(&fontHeight);
 	fHeight = fontHeight.ascent + fontHeight.descent;
 
-	if (Vertical()) {
+	if (fOrientation) {
 		float appWidth = static_cast<TBarApp*>(be_app)->Settings()->width;
 		*width = fMaxWidth
 			= std::min(appWidth - (kDragRegionWidth + kHMargin) * 2, timeWidth);