[haiku-commits] haiku: hrev51422 - src/apps/deskbar

  • From: jscipione@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Thu, 14 Sep 2017 00:49:14 +0200 (CEST)

hrev51422 adds 1 changeset to branch 'master'
old head: 6d7890478b78265f4670978a58384fb438de0007
new head: 032a3f45f76d811cb25e76a96a2c817ce3840b99
overview: 
http://cgit.haiku-os.org/haiku/log/?qt=range&q=032a3f45f76d+%5E6d7890478b78

----------------------------------------------------------------------------

032a3f45f76d: Revert "Deskbar: eliminate infinite loop bug"
  
  This reverts commit 6d7890478b78265f4670978a58384fb438de0007.
  
  Fixed the bug, but, causes another bug, will revisit.

                                     [ John Scipione <jscipione@xxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev51422
Commit:      032a3f45f76d811cb25e76a96a2c817ce3840b99
URL:         http://cgit.haiku-os.org/haiku/commit/?id=032a3f45f76d
Author:      John Scipione <jscipione@xxxxxxxxx>
Date:        Wed Sep 13 22:48:24 2017 UTC

----------------------------------------------------------------------------

3 files changed, 1 insertion(+), 10 deletions(-)
src/apps/deskbar/BarWindow.cpp      | 1 +
src/apps/deskbar/ExpandoMenuBar.cpp | 9 ---------
src/apps/deskbar/ExpandoMenuBar.h   | 1 -

----------------------------------------------------------------------------

diff --git a/src/apps/deskbar/BarWindow.cpp b/src/apps/deskbar/BarWindow.cpp
index db38219..e57c4e2 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 643d013..1e2850c 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 1aa2e86..5f338c5 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();
 


Other related posts:

  • » [haiku-commits] haiku: hrev51422 - src/apps/deskbar - jscipione