Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37799 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Alex Wilson 2010-07-29 00:25:12 +00:00
parent 106d8c4e5b
commit e867b26f14
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/kits/interface/TabView.cpp
View File

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