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

This reverts commit 6d7890478b78265f4670978a58384fb438de0007.

Fixed the bug, but, causes another bug, will revisit.
---
 src/apps/deskbar/BarWindow.cpp      | 1 +
 src/apps/deskbar/ExpandoMenuBar.cpp | 9 ---------
 src/apps/deskbar/ExpandoMenuBar.h   | 1 -
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/apps/deskbar/BarWindow.cpp b/src/apps/deskbar/BarWindow.cpp
index db3821951e..e57c4e214e 100644
--- a/src/apps/deskbar/BarWindow.cpp
+++ b/src/apps/deskbar/BarWindow.cpp
@@ -252,6 +252,7 @@ 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 643d01306e..1e2850c7e2 100644
--- a/src/apps/deskbar/ExpandoMenuBar.cpp
+++ b/src/apps/deskbar/ExpandoMenuBar.cpp
@@ -114,15 +114,6 @@ TExpandoMenuBar::TExpandoMenuBar(TBarView* barView, bool vertical)
 
 
 void
-TExpandoMenuBar::AllAttached()
-{
-	BMenuBar::AllAttached();
-
-	SizeWindow(0);
-}
-
-
-void
 TExpandoMenuBar::AttachedToWindow()
 {
 	BMenuBar::AttachedToWindow();
diff --git a/src/apps/deskbar/ExpandoMenuBar.h b/src/apps/deskbar/ExpandoMenuBar.h
index 1aa2e86533..5f338c5ac9 100644
--- a/src/apps/deskbar/ExpandoMenuBar.h
+++ b/src/apps/deskbar/ExpandoMenuBar.h
@@ -63,7 +63,6 @@ class TExpandoMenuBar : public BMenuBar {
 public:
 							TExpandoMenuBar(TBarView* barView, bool vertical);
 
-	virtual	void			AllAttached();
 	virtual	void			AttachedToWindow();
 	virtual	void			DetachedFromWindow();
 
-- 
2.11.4.GIT