Fix for 71139. Also reverting the splitter frame code back. r=danm, sr=brendan
git-svn-id: svn://10.0.0.236/trunk@88856 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
e94e03d340
commit
8c422398c6
@ -452,6 +452,21 @@ nsSplitterFrame::DoLayout(nsBoxLayoutState& aState)
|
||||
return nsBoxFrame::DoLayout(aState);
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
nsSplitterFrame::GetInitialOrientation(PRBool& aIsHorizontal)
|
||||
{
|
||||
nsIBox* box;
|
||||
GetParentBox(&box);
|
||||
if (box) {
|
||||
PRBool horizontal;
|
||||
box->GetOrientation(horizontal);
|
||||
aIsHorizontal = !horizontal;
|
||||
}
|
||||
else
|
||||
nsBoxFrame::GetInitialOrientation(aIsHorizontal);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsSplitterFrame::HandlePress(nsIPresContext* aPresContext,
|
||||
nsGUIEvent * aEvent,
|
||||
|
||||
@ -104,6 +104,8 @@ public:
|
||||
nsFramePaintLayer aWhichLayer,
|
||||
nsIFrame** aFrame);
|
||||
|
||||
virtual void GetInitialOrientation(PRBool& aIsHorizontal);
|
||||
|
||||
private:
|
||||
|
||||
friend class nsSplitterFrameInner;
|
||||
|
||||
@ -74,6 +74,7 @@ XUL_ATOM(outer, "outer") // indicates that a treechildren is the outermost rowgr
|
||||
XUL_ATOM(sizemode, "sizemode") // when set, measure strings to determine preferred width
|
||||
|
||||
XUL_ATOM(open, "open") // Whether or not a menu, tree, etc. is open
|
||||
XUL_ATOM(focus, "focus")
|
||||
|
||||
XUL_ATOM(outliner, "outliner")
|
||||
XUL_ATOM(outlinerbody, "outlinerbody")
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user