Form editor: When a container has "full" arrangement, keep the z-order of its children as defined by the user.
[DEVELOPMENT ENVIRONMENT] * BUG: Form editor: When a container has "full" arrangement, keep the z-order of its children as defined by the user.
This commit is contained in:
parent
84e8bfd742
commit
c767105ebb
1 changed files with 31 additions and 27 deletions
|
@ -2098,38 +2098,42 @@ Private Sub ArrangeContainer(hParent As Container, sArr As String, Optional bInv
|
||||||
|
|
||||||
$hUndo.Begin
|
$hUndo.Begin
|
||||||
|
|
||||||
For Each hCtrl In aCtrl
|
If sArr <> "F" Then
|
||||||
If bRec Then
|
|
||||||
Try hCont = hCtrl
|
|
||||||
If Not Error Then
|
|
||||||
ArrangeContainer(hCtrl, sArr, bInvert)
|
|
||||||
Endif
|
|
||||||
Endif
|
|
||||||
sKey = GetSortKey(hCtrl, sArr, bInvert)
|
|
||||||
cSortKey[hCtrl.Name] = sKey
|
|
||||||
aPos.Add(sKey)
|
|
||||||
If sLastKey And If sKey < sLastKey Then
|
|
||||||
bModify = True
|
|
||||||
Endif
|
|
||||||
sLastKey = sKey
|
|
||||||
Next
|
|
||||||
|
|
||||||
If aPos.Count Then
|
For Each hCtrl In aCtrl
|
||||||
|
If bRec Then
|
||||||
aPos.Sort(gb.Descent)
|
Try hCont = hCtrl
|
||||||
|
If Not Error Then
|
||||||
For Each sPos In aPos
|
ArrangeContainer(hCtrl, sArr, bInvert)
|
||||||
For Each hCtrl In aCtrl
|
|
||||||
If cSortKey[hCtrl.Name] = sPos Then
|
|
||||||
hCtrl.Lower
|
|
||||||
Break
|
|
||||||
Endif
|
Endif
|
||||||
Next
|
Endif
|
||||||
|
sKey = GetSortKey(hCtrl, sArr, bInvert)
|
||||||
|
cSortKey[hCtrl.Name] = sKey
|
||||||
|
aPos.Add(sKey)
|
||||||
|
If sLastKey And If sKey < sLastKey Then
|
||||||
|
bModify = True
|
||||||
|
Endif
|
||||||
|
sLastKey = sKey
|
||||||
Next
|
Next
|
||||||
|
|
||||||
FFormStack.RefreshAll
|
If aPos.Count Then
|
||||||
|
|
||||||
If bModify Then Modify
|
aPos.Sort(gb.Descent)
|
||||||
|
|
||||||
|
For Each sPos In aPos
|
||||||
|
For Each hCtrl In aCtrl
|
||||||
|
If cSortKey[hCtrl.Name] = sPos Then
|
||||||
|
hCtrl.Lower
|
||||||
|
Break
|
||||||
|
Endif
|
||||||
|
Next
|
||||||
|
Next
|
||||||
|
|
||||||
|
FFormStack.RefreshAll
|
||||||
|
|
||||||
|
If bModify Then Modify
|
||||||
|
|
||||||
|
Endif
|
||||||
|
|
||||||
Endif
|
Endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue