From da28629ffc2f2aac313bcff1eeaab2fbfe8d85ec Mon Sep 17 00:00:00 2001
From: Khushboo Mehta <mehtakhushboo@hotmail.com>
Date: Wed, 17 Nov 2021 12:49:03 +0100
Subject: [PATCH] fix(@desktop/browser): Fix for Favorites bar is not shown
 without disabling and enabling toggle

Also fixed issue of overlap after a switch between disbaled to enabled state

fixes #4105
---
 ui/app/AppLayouts/Browser/panels/BrowserHeader.qml | 3 +--
 ui/app/AppLayouts/Browser/panels/FavoritesBar.qml  | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ui/app/AppLayouts/Browser/panels/BrowserHeader.qml b/ui/app/AppLayouts/Browser/panels/BrowserHeader.qml
index 26b3c33bbc..a4f90ad300 100644
--- a/ui/app/AppLayouts/Browser/panels/BrowserHeader.qml
+++ b/ui/app/AppLayouts/Browser/panels/BrowserHeader.qml
@@ -31,7 +31,7 @@ Rectangle {
     signal addNewFavoritelClicked(var xPos)
 
     width: parent.width
-    height: barRow.height + favoritesBarLoader.height
+    height: barRow.height + (favoritesBarLoader.active ? favoritesBarLoader.height : 0)
     color: Style.current.background
     border.width: 0
 
@@ -270,7 +270,6 @@ Rectangle {
     Loader {
         id: favoritesBarLoader
         active: localAccountSensitiveSettings.shouldShowFavoritesBar
-        height: active ? item.height : 0
         anchors.top: barRow.bottom
         anchors.left: parent.left
         anchors.leftMargin: Style.current.smallPadding
diff --git a/ui/app/AppLayouts/Browser/panels/FavoritesBar.qml b/ui/app/AppLayouts/Browser/panels/FavoritesBar.qml
index ab415bbd38..9836a7e0eb 100644
--- a/ui/app/AppLayouts/Browser/panels/FavoritesBar.qml
+++ b/ui/app/AppLayouts/Browser/panels/FavoritesBar.qml
@@ -11,7 +11,7 @@ RowLayout {
     property alias bookmarkModel: bookmarkList.model
 
     spacing: 0
-    height: bookmarkModel.rowCount() > 0 ? 38: 0
+    height: 38
 
     ListView {
         id: bookmarkList