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

TextEditor: Fix highlighting of matching indentations.

Browse source 
[GB.FORM.EDITOR]
* BUG: TextEditor: Fix highlighting of matching indentations.
This commit is contained in:
gambas 2018-03-12 00:07:51 +01:00
parent cc79f63461
commit 2a0be69773
2 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
comp/src/gb.form.editor/.src/FTestEditor.form
View file

@ -40,7 +40,7 @@
Expand = True
{ TextEditor1 TextEditor
MoveScaled(14,5,47,33)
Font = Font["Gambas"]
Font = Font["Source Code Pro Light,+2"]
Background = Color.TextBackground
Border = False
Mode = "Gambas"

27
comp/src/gb.form.editor/.src/TextEditor.class
View file

@ -793,7 +793,8 @@ Private Sub DrawLine(X As Integer, Y As Integer, Width As Integer, Height As Int
Dim sCar As String
Dim aLayout As Integer[]
Dim I As Integer
Dim P, D As Integer
Dim P As Integer
Dim D As Float
Dim sText As String
Dim YY As Integer
Dim H As Integer
@ -940,9 +941,11 @@ Private Sub DrawLine(X As Integer, Y As Integer, Width As Integer, Height As Int
If $bShowIndent Then
P = GetLineIndentMark(Row, sText)
D = $iSpaceWidth \ 2
D = $iSpaceWidth / 4
If $IP And If Row >= $IY1 And If Row <= $IY2 Then IP = X + $IP
Paint.Translate($iSpaceWidth \ 2, 0)
XP = 0
Do
@ -951,21 +954,32 @@ Private Sub DrawLine(X As Integer, Y As Integer, Width As Integer, Height As Int
XX = X + XP * $iTabWidth
Else
XP += $iTabSize
XX = X + $hFont.TextWidth(String$(XP, " "))
If $fCharWidth Then
XX = X + CInt($fCharWidth * XP)
Else
XX = X + $hFont.TextWidth(String$(XP, " "))
Endif
Endif
If XX >= P Then Break
If IP And If XX = IP Then
IP = 0
Paint.FillRect(XX + D, Y, D, Height, $iMatchColor)
Paint.Rectangle(XX, Y, D, Height)
Paint.Background = Color.SetAlpha($iMatchColor, 64)
Paint.Fill
'Paint.FillRect(XX + D, Y, D, Height, $iMatchColor)
Else
Paint.FillRect(XX + D, Y, D / 2, Height, $iIndentColor)
Paint.Rectangle(XX, Y, D / 2, Height)
Paint.Background = $iIndentColor
Paint.Fill
Endif
iEndingSpaceLimit = XX
Loop
Paint.Translate(- $iSpaceWidth \ 2, 0)
' If IP Then
' If Row = $IY1 Then
' Paint.FillRect(IP - D * 3, Y + H \ 2, D, Height - H \ 2, $iMatchColor)
@ -2469,6 +2483,7 @@ Private Sub CheckIndentMark()
IY1 = Y1
IY2 = Y2
Endif
'Debug "=> "; IY1 + 1;; IY2 + 1;; IP
SET_RESULT:
@ -2770,7 +2785,7 @@ Public Sub View_Draw()
$iForeground = $hStyles[Highlight.Normal].Color
$iSelectedBackground = $hStyles[Highlight.Selection].Color
$iLimitColor = Color.Gradient($iBackground, $hStyles[Highlight.Comment].Color)
$iIndentColor = Color.SetAlpha($iLimitColor, 192)
$iIndentColor = Color.SetAlpha($iLimitColor, 160)
$iMatchColor = $hStyles[Highlight.Highlight].Color
'$iIndentColor = Color.Gradient($iBackground, $iForeground)
$iMarginColor = Color.Merge($iLimitColor, $iBackground, 0.8)