From 4ba77eee7a6dc7595e4f99a725f660ff1ea4dda1 Mon Sep 17 00:00:00 2001
From: Syarif Fakhri <asybaf@gmail.com>
Date: Thu, 22 Jun 2023 14:33:42 +0800
Subject: [PATCH] Change logic for when side bar widgets are hidden Previously,
 the resize event of the side bar was used to determine if the side bar should
 be hidden or not. Smaller side bar means there's no visible side tabs so it
 would be hidden. This assumption breaks during startup, when the size of the
 side bar or tabs is not valid yet.

---
 src/AutoHideSideBar.cpp | 48 ++++++++++++++++++++---------------------
 src/AutoHideSideBar.h   |  5 +++++
 2 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/src/AutoHideSideBar.cpp b/src/AutoHideSideBar.cpp
index c64b079..6e95007 100644
--- a/src/AutoHideSideBar.cpp
+++ b/src/AutoHideSideBar.cpp
@@ -127,27 +127,6 @@ void AutoHideSideBarPrivate::handleViewportEvent(QEvent* e)
 		}
 		break;
 
-	case QEvent::Resize:
-		if (_this->tabCount())
-		{
-			auto ev = static_cast<QResizeEvent*>(e);
-			auto Tab = _this->tabAt(0);
-			int Size = isHorizontal() ? ev->size().height() : ev->size().width();
-			int TabSize = isHorizontal() ? Tab->size().height() : Tab->size().width();
-			// If the size of the side bar is less than the size of the first tab
-			// then there are no visible tabs in this side bar. This check will
-			// fail if someone will force a very big border via CSS!!
-			if (Size < TabSize)
-			{
-				_this->hide();
-			}
-		}
-		else
-		{
-			_this->hide();
-		}
-		break;
-
 	default:
 		break;
 	}
@@ -288,14 +267,18 @@ void CAutoHideSideBar::removeTab(CAutoHideTab* SideTab)
 //============================================================================
 bool CAutoHideSideBar::eventFilter(QObject *watched, QEvent *event)
 {
-	if (event->type() != QEvent::ShowToParent)
+	// As soon as a tab is hidden, we need to check if the side tab should be hidden
+	auto Tab = qobject_cast<CAutoHideTab*>(watched);
+	if (Tab && event->type() == QEvent::Hide)
 	{
-		return false;
+		if (visibleTabCount() == 0)
+		{
+			hide();
+		}
 	}
 
 	// As soon as on tab is shown, we need to show the side tab bar
-	auto Tab = qobject_cast<CAutoHideTab*>(watched);
-	if (Tab)
+	if (Tab && event->type() == QEvent::ShowToParent)
 	{
 		show();
 	}
@@ -323,6 +306,21 @@ int CAutoHideSideBar::tabCount() const
 }
 
 
+//============================================================================
+int CAutoHideSideBar::visibleTabCount() const
+{
+	int count = 0;
+	for (auto i = 0; i < tabCount(); i++)
+	{
+		if (tabAt(i)->isVisible())
+		{
+			count++;
+		}
+	}
+	return count;
+}
+
+
 //============================================================================
 SideBarLocation CAutoHideSideBar::sideBarLocation() const
 {
diff --git a/src/AutoHideSideBar.h b/src/AutoHideSideBar.h
index 3575357..6daaf9c 100644
--- a/src/AutoHideSideBar.h
+++ b/src/AutoHideSideBar.h
@@ -134,6 +134,11 @@ public:
 	 */
 	int tabCount() const;
 
+	/*
+	 * Gets the count of visible tab widgets
+	 */
+	int visibleTabCount() const;
+
 	/**
 	 * Getter for side tab bar area property
 	 */