From bf28e4351e509c24bb374f2674e116996f3c8420 Mon Sep 17 00:00:00 2001 From: "dbaron%dbaron.org" Date: Fri, 30 Sep 2005 19:25:42 +0000 Subject: [PATCH] Back out bug 281709 since it makes tabbed browsing unusable on at least GTK2. --- view/src/nsView.cpp | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/view/src/nsView.cpp b/view/src/nsView.cpp index af8666d5f24..ac8d3809c81 100644 --- a/view/src/nsView.cpp +++ b/view/src/nsView.cpp @@ -427,16 +427,6 @@ void nsView::ResetWidgetBounds(PRBool aRecurse, PRBool aMoveOnly, mWindow->Resize(newBounds.width, newBounds.height, aInvalidateChangedSize); } // else do nothing! } - PRBool vis = PR_FALSE; - mWindow->IsVisible(vis); - if (vis != (mVis == nsViewVisibility_kShow)) { -#ifndef HIDE_ALL_WIDGETS - if (mVis == nsViewVisibility_kShow) - mWindow->Show(PR_TRUE); - else -#endif - mWindow->Show(PR_FALSE); - } } else if (aRecurse) { // reposition any widgets under this view for (nsView* v = GetFirstChild(); v; v = v->GetNextSibling()) { @@ -475,7 +465,15 @@ NS_IMETHODIMP nsView::SetVisibility(nsViewVisibility aVisibility) DropMouseGrabbing(); } - ResetWidgetBounds(PR_FALSE, PR_FALSE, PR_FALSE); + if (nsnull != mWindow) + { +#ifndef HIDE_ALL_WIDGETS + if (mVis == nsViewVisibility_kShow) + mWindow->Show(PR_TRUE); + else +#endif + mWindow->Show(PR_FALSE); + } return NS_OK; }