luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Draw the form editor tooltip on two lines, and do not open the signature popup if we are inside a string.

Browse source 
[DEVELOPMENT ENVIRONMENT]
* NEW: Form editor: Draw the tooltip on two lines.
* NEW: Code editor: Do not open the signature popup if we are inside a string.
This commit is contained in:
gambas 2018-03-22 02:58:46 +01:00
parent cc1879b3cc
commit 390b47ad50
3 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/src/gambas3/.src/Editor/Code/FEditor.class
View file

@ -920,13 +920,12 @@ Public Sub Editors_KeyPress()
If DoStructControlCompletion(iLine, sLine, aSymbol) Then Return If DoStructControlCompletion(iLine, sLine, aSymbol) Then Return
Else If Key.Code = Key.Space Then Else If Key.Code = Key.Space Or If InStr("(),[]", Key.Text) Then
$bCheckSignature = True
Else If InStr("(),[]", Key.Text) Then
sLine = String.Left$(Highlight.Purge($hEditor.Current.Text, False, True), $hEditor.Column)
If Not GetRightString(sLine) Then
$bCheckSignature = True $bCheckSignature = True
Endif
Else If Key.Code = Key.Tab Then Else If Key.Code = Key.Tab Then

2
app/src/gambas3/.src/Editor/Code/FEditor.form
View file

@ -493,7 +493,7 @@
} }
} }
{ timShowHelp #Timer { timShowHelp #Timer
#MoveScaled(63,14) #MoveScaled(62,16)
} }
{ timProc #Timer { timProc #Timer
#MoveScaled(61,34) #MoveScaled(61,34)

16
app/src/gambas3/.src/Editor/Form/FForm.class
View file

@ -1647,7 +1647,7 @@ Public Sub UpdateInfo(hCCtrl As CControl)
$cInfo = ["Name": hCCtrl.Name, "Kind": hCCtrl.Kind, "X": hCCtrl.X, "Y": hCCtrl.Y, "Width": hCCtrl.Width, "Height": hCCtrl.Height] $cInfo = ["Name": hCCtrl.Name, "Kind": hCCtrl.Kind, "X": hCCtrl.X, "Y": hCCtrl.Y, "Width": hCCtrl.Width, "Height": hCCtrl.Height]
dwgInfo.Resize(dwgInfo.Font.TextWidth("99999") * 4 + Desktop.Scale * 4, dwgInfo.Font.Height * 3 + Desktop.Scale * 2) dwgInfo.Resize(dwgInfo.Font.TextWidth("99999") * 4 + Desktop.Scale * 8, dwgInfo.Font.Height * 2 + Desktop.Scale * 2)
dwgInfo.Tag = sText dwgInfo.Tag = sText
MoveInfo MoveInfo
@ -4322,21 +4322,25 @@ Public Sub dwgInfo_Draw()
iCol = Color.SetAlpha(Color.TooltipBackground, 128) iCol = Color.SetAlpha(Color.TooltipBackground, 128)
H = Paint.Font.Height * 2 + DS H = Paint.Font.Height + DS
Paint.FillRect(0, 0, Paint.W, H, iCol) Paint.FillRect(0, 0, Paint.W, H, iCol)
Paint.FillRect(0, H + 1, Paint.W, Paint.H - H - 1, iCol) Paint.FillRect(0, H + 1, Paint.W, Paint.H - H - 1, iCol)
Paint.ClipRect = Rect(DS, DS \ 2, Paint.W - DS * 2, Paint.H - DS) Paint.ClipRect = Rect(DS, DS \ 2, Paint.W - DS * 2, Paint.H - DS)
X = DS
Y = DS \ 2 Y = DS \ 2
W = (Paint.W - DS * 2) / 2 - DS
Paint.Font.Bold = True Paint.Font.Bold = True
Paint.DrawText($cInfo!Name, DS, Y, Paint.W - DS * 2, Paint.Font.Height, Align.Center) Paint.DrawText($cInfo!Name, X, Y, W, Paint.Font.Height, Align.Right)
X += W
Paint.Font.Bold = False Paint.Font.Bold = False
Y += Paint.Font.Height Paint.DrawText($cInfo!Kind, X + DS, Y, W, Paint.Font.Height, Align.Left)
Paint.DrawText($cInfo!Kind, DS, Y, Paint.W - DS * 2, Paint.Font.Height, Align.Center) 'Y += Paint.Font.Height
' Paint.DrawText($cInfo!Kind, DS, Y, Paint.W - DS * 2, Paint.Font.Height, Align.Center)
X = DS X = DS
Y = DS + Paint.Font.Height * 2 Y = DS + Paint.Font.Height
W = (Paint.W - DS * 2) / 4 W = (Paint.W - DS * 2) / 4
H = Paint.H - Y H = Paint.H - Y