Embedding controls in a new container now takes the form family into account.

[DEVELOPMENT ENVIRONMENT]
* NEW: Don't open the console if the compilation is successful.
* BUG: Form editor: Embedding controls in a new container now takes the form family into account.
This commit is contained in:
gambas 2017-08-28 19:11:15 +02:00
parent 088f5b9cfa
commit 0538985834
3 changed files with 6 additions and 3 deletions

View file

@ -1388,7 +1388,7 @@ Public Sub SetCompilation(Optional sOutput As String)
gvwCompilation.Clear
If Not sOutput Then
HideTab(TAB_COMPILATION)
GotoConsole
'GotoConsole
Return
Endif

View file

@ -93,11 +93,13 @@ Public Sub trmOutput_KeyPress()
If Key.Code = Key["L"] Then
Clear
Stop Event
Else If Key.Code = Key["G"] Then
' edtOutput.ReadOnly = False
' edtOutput.Print(Chr$(7))
' edtOutput.ReadOnly = True
' TODO: flash
Stop Event
Endif
Endif

View file

@ -3762,6 +3762,7 @@ Private Sub EmbedIntoContainer()
Dim hParent As CControl
Dim X1, Y1, X2, Y2 As Integer
Dim sChildren As String
Dim D As Integer
X1 = Master.X
Y1 = Master.Y
@ -3777,8 +3778,8 @@ Private Sub EmbedIntoContainer()
$hUndo.Begin
hParent = CreateControl($hFamily.EmbedContainer, Master.Parent)
' TODO: Replace Desktop.Scale by a value depending on family
hParent.MoveAndResize(X1, Y1, X2 - X1 + Desktop.Scale, Y2 - Y1 + Desktop.Scale)
D = $hFamily.GetSnap()
hParent.MoveAndResize(X1, Y1, X2 - X1 + D, Y2 - Y1 + D)
DeleteSelection
UnselectAll