From cc40a515be3362e5fd213f794d05579e446aec18 Mon Sep 17 00:00:00 2001
From: Johannes Schill <johannes.schill@polyester.se>
Date: Mon, 4 Mar 2019 13:46:10 +0100
Subject: [PATCH] fix: When in tv-mode, autofitpanel should not take space from
 the navbar #15650

---
 public/app/features/dashboard/state/DashboardModel.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/app/features/dashboard/state/DashboardModel.ts b/public/app/features/dashboard/state/DashboardModel.ts
index 17af2dbd801..2a445c9a58c 100644
--- a/public/app/features/dashboard/state/DashboardModel.ts
+++ b/public/app/features/dashboard/state/DashboardModel.ts
@@ -887,8 +887,8 @@ export class DashboardModel {
     }
 
     // add back navbar height
-    if (kioskMode === KIOSK_MODE_TV) {
-      visibleHeight += 55;
+    if (kioskMode && kioskMode !== KIOSK_MODE_TV) {
+      visibleHeight += navbarHeight;
     }
 
     const visibleGridHeight = Math.floor(visibleHeight / (GRID_CELL_HEIGHT + GRID_CELL_VMARGIN));