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

Tracker: don't initialize layouts when we're not supposed to.

Browse Source 
This didn't cause any problems before because all the views that don't
use layouts reimplemented this function. But that may not be the case in
the future.
This commit is contained in:
Augustin Cavalier 2015-03-02 11:29:11 -05:00
parent 4a33b4e55c
commit 1dedefaf23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/kits/tracker/ContainerWindow.cpp
View File

@ -461,6 +461,7 @@ BContainerWindow::BContainerWindow(LockingList<BWindow>* list,
:
BWindow(InitialWindowRect(feel), "TrackerWindow", look, feel, flags,
workspace),
fUseLayouts(useLayouts),
fMenuContainer(NULL),
fPoseContainer(NULL),
fBorderedView(NULL),
@ -1011,7 +1012,7 @@ BContainerWindow::RestoreState(const BMessage &message)
void
BContainerWindow::RestoreStateCommon()
{
if (!fIsDesktop)
if (!fIsDesktop && fUseLayouts)
InitLayout();
if (BootedInSafeMode())

1
src/kits/tracker/ContainerWindow.h
View File

@ -280,6 +280,7 @@ protected:
BObjectList<Model>*, void*, BStringList&);
void LoadAddOn(BMessage*);
bool fUseLayouts;
BGroupLayout* fRootLayout;
BGroupView* fMenuContainer;
BGridView* fPoseContainer;