From e867b26f14e431090aca5251822e409887d9323e Mon Sep 17 00:00:00 2001
From: Alex Wilson <yourpalal2@gmail.com>
Date: Thu, 29 Jul 2010 00:25:12 +0000
Subject: [PATCH] Update BTabView to initialize fContainerView to NULL before
 calling _InitContainerView() from _InitData(). This fixes a regression
 DeadYak pointed out to me on IRC. (thanks DeadYak, sorry everyone!) Also a
 bit of cleanup, improved _InitContainerView() to not AddChild(fContainerView)
 if it was not created. Also archive BTabView::fBorderStyle.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37799 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/kits/interface/TabView.cpp | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/kits/interface/TabView.cpp b/src/kits/interface/TabView.cpp
index d3d3e8b9c5..6ba603f6f6 100644
--- a/src/kits/interface/TabView.cpp
+++ b/src/kits/interface/TabView.cpp
@@ -382,7 +382,8 @@ BTab &BTab::operator=(const BTab &)
 
 
 BTabView::BTabView(const char *name, button_width width, uint32 flags)
-	: BView(name, flags)
+	:
+	BView(name, flags)
 {
 	_InitObject(true, width);
 }
@@ -390,7 +391,8 @@ BTabView::BTabView(const char *name, button_width width, uint32 flags)
 
 BTabView::BTabView(BRect frame, const char *name, button_width width,
 	uint32 resizingMode, uint32 flags)
-	: BView(frame, name, resizingMode, flags)
+	:
+	BView(frame, name, resizingMode, flags)
 {
 	_InitObject(false, width);
 }
@@ -429,6 +431,9 @@ BTabView::BTabView(BMessage *archive)
 	if (archive->FindInt32("_sel", &fSelection) != B_OK)
 		fSelection = 0;
 
+	if (archive->FindInt32("_border_style", (int32*)&fBorderStyle) != B_OK)
+		fBorderStyle = B_FANCY_BORDER;
+
 	int32 i = 0;
 	BMessage tabMsg;
 
@@ -488,6 +493,8 @@ BTabView::Archive(BMessage* archive, bool deep) const
 		ret = archive->AddFloat("_high", fTabHeight);
 	if (ret == B_OK)
 		ret = archive->AddInt32("_sel", fSelection);
+	if (ret == B_OK && fBorderStyle != B_FANCY_BORDER)
+		ret = archive->AddInt32("_border_style", fBorderStyle);
 
 	if (ret == B_OK && deep) {
 		for (int32 i = 0; i < CountTabs(); i++) {
@@ -1361,6 +1368,7 @@ BTabView::_InitObject(bool layouted, button_width width)
 	GetFontHeight(&fh);
 	fTabHeight = fh.ascent + fh.descent + fh.leading + 8.0f;
 
+	fContainerView = NULL;
 	_InitContainerView(layouted);
 }
 
@@ -1369,6 +1377,7 @@ void
 BTabView::_InitContainerView(bool layouted)
 {
 	bool needsLayout = false;
+	bool createdContainer = false;
 	if (layouted) {
 		if (!GetLayout()) {
 			SetLayout(new(nothrow) BGroupLayout(B_HORIZONTAL));
@@ -1378,16 +1387,18 @@ BTabView::_InitContainerView(bool layouted)
 		if (!fContainerView) {
 			fContainerView = new BView("view container", B_WILL_DRAW);
 			fContainerView->SetLayout(new(std::nothrow) BCardLayout());
-			needsLayout = true;
+			createdContainer = true;
 		}
 	} else if (!fContainerView) {
 		fContainerView = new BView(Bounds(), "view container", B_FOLLOW_ALL,
 			B_WILL_DRAW);
-		needsLayout= true;
+		createdContainer = true;
 	}
 
-	if (needsLayout) {
+	if (needsLayout || createdContainer)
 		_LayoutContainerView(layouted);
+
+	if (createdContainer) {
 		fContainerView->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
 		fContainerView->SetLowColor(fContainerView->ViewColor());
 		AddChild(fContainerView);