From 037df92938644bf5894ac2024fb051b7b1b01f68 Mon Sep 17 00:00:00 2001
From: John Scipione <jscipione@gmail.com>
Date: Wed, 13 Sep 2017 15:50:35 -0700
Subject: [PATCH] Revert "Revert "Deskbar: eliminate infinite loop bug""

This reverts commit 032a3f45f76d811cb25e76a96a2c817ce3840b99.
---
 src/apps/deskbar/BarWindow.cpp      | 1 -
 src/apps/deskbar/ExpandoMenuBar.cpp | 9 +++++++++
 src/apps/deskbar/ExpandoMenuBar.h   | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/apps/deskbar/BarWindow.cpp b/src/apps/deskbar/BarWindow.cpp
index e57c4e214e..db3821951e 100644
--- a/src/apps/deskbar/BarWindow.cpp
+++ b/src/apps/deskbar/BarWindow.cpp
@@ -252,7 +252,6 @@ TBarWindow::FrameResized(float width, float height)
 		if (fBarView->Vertical() && fBarView->ExpandoState())
 			fBarView->ExpandoMenuBar()->SetMaxContentWidth(width);
 
-		fBarView->UpdatePlacement();
 		Unlock();
 	}
 }
diff --git a/src/apps/deskbar/ExpandoMenuBar.cpp b/src/apps/deskbar/ExpandoMenuBar.cpp
index 1e2850c7e2..643d01306e 100644
--- a/src/apps/deskbar/ExpandoMenuBar.cpp
+++ b/src/apps/deskbar/ExpandoMenuBar.cpp
@@ -113,6 +113,15 @@ TExpandoMenuBar::TExpandoMenuBar(TBarView* barView, bool vertical)
 }
 
 
+void
+TExpandoMenuBar::AllAttached()
+{
+	BMenuBar::AllAttached();
+
+	SizeWindow(0);
+}
+
+
 void
 TExpandoMenuBar::AttachedToWindow()
 {
diff --git a/src/apps/deskbar/ExpandoMenuBar.h b/src/apps/deskbar/ExpandoMenuBar.h
index 5f338c5ac9..1aa2e86533 100644
--- a/src/apps/deskbar/ExpandoMenuBar.h
+++ b/src/apps/deskbar/ExpandoMenuBar.h
@@ -63,6 +63,7 @@ class TExpandoMenuBar : public BMenuBar {
 public:
 							TExpandoMenuBar(TBarView* barView, bool vertical);
 
+	virtual	void			AllAttached();
 	virtual	void			AttachedToWindow();
 	virtual	void			DetachedFromWindow();