Related: fdo#61688 get strict ordering right

Change-Id: Ibb3e74e98762358614713688d64e50db21025f1d
This commit is contained in:
Caolán McNamara 2013-04-04 09:27:20 +01:00
parent aebfef8d6e
commit 8c4f20938b

View file

@ -1441,8 +1441,13 @@ bool VclBuilder::sortIntoBestTabTraversalOrder::operator()(const Window *pA, con
if (pA->GetParent() == pB->GetParent())
{
const VclFrame *pFrameParent = dynamic_cast<const VclFrame*>(pA->GetParent());
if (pFrameParent && pA == pFrameParent->get_label_widget())
return true;
if (pFrameParent)
{
const Window *pLabel = pFrameParent->get_label_widget();
int nFramePosA = (pA == pLabel) ? 0 : 1;
int nFramePosB = (pB == pLabel) ? 0 : 1;
return nFramePosA < nFramePosB;
}
}
return false;
}