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

File compression: Forgot the "of" keyword in the javascript compression algorithm.

Browse source 
[DEVELOPMENT ENVIRONMENT]
* BUG: File compression: Forgot the "of" keyword in the javascript compression algorithm.
* BUG: Project open dialog: Fix overlapping text when drawing project titles.
This commit is contained in:
gambas 2021-03-26 14:45:14 +01:00
parent 9d475897fa
commit 4f01f4e690
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/gambas3/.src/Editor/MCompressFile.module
View file

@ -56,8 +56,7 @@ Private Sub InitJavascriptKeywords()
$cKeyword = New Collection $cKeyword = New Collection
For Each sStr In ["break", "case", "catch", "class", "const", "continue", "debugger", "default", "delete", "do", "else", "enum", "export", "extends", "finally", "for", For Each sStr In ["break", "case", "catch", "class", "const", "continue", "debugger", "default", "delete", "do", "else", "enum", "export", "extends", "finally", "for", "function", "if", "import", "in", "of", "instanceof", "new", "return", "super", "switch", "throw", "try", "typeof", "var", "void", "while", "with", "yield"]
"function", "if", "import", "in", "instanceof", "new", "return", "super", "switch", "throw", "try", "typeof", "var", "void", "while", "with", "yield"]
$cKeyword[sStr] = 0 $cKeyword[sStr] = 0
Next Next

10
app/src/gambas3/.src/Project/ProjectBox.class
View file

@ -54,8 +54,8 @@ Public Sub _new()
$hObs = New Observer(Me) As "ProjectItem" $hObs = New Observer(Me) As "ProjectItem"
If Not $hRemove Then If Not $hRemove Then
$hRemove = Picture["icon:/small/remove"].Image $hRemove = Picture["icon:/small/close"].Image
$hRemoveGray = $hRemove.Copy().Brightness(1).Colorize(Color.LightGray) $hRemoveGray = $hRemove.Copy().Desaturate().Lightness(0.5)
Endif Endif
' If Not $hGradient Then ' If Not $hGradient Then
@ -235,6 +235,7 @@ Public Sub DrawingArea_Draw()
'Paint.DrawTextShadow(sText, X, Y, W, H, Align.TopLeft) 'Paint.DrawTextShadow(sText, X, Y, W, H, Align.TopLeft)
Paint.Font.Bold = True Paint.Font.Bold = True
Paint.DrawText(sText, X, Y, W, H, Align.TopLeft) Paint.DrawText(sText, X, Y, W, H, Align.TopLeft)
WT = Paint.Font.TextWidth(sText)
Paint.Font.Bold = False Paint.Font.Bold = False
If Template Then If Template Then
@ -251,10 +252,8 @@ Public Sub DrawingArea_Draw()
Else If bSmall Then Else If bSmall Then
WT = Paint.Font.TextWidth(sText & " ")
Paint.Font.Bold = False Paint.Font.Bold = False
sText = .Version sText = " • " & .Version
'Paint.Background = Color.Red 'Paint.Background = Color.Red
'Paint.DrawTextShadow(sText, X + WT, Y, Paint.W, Paint.H, Align.TopLeft, 4) 'Paint.DrawTextShadow(sText, X + WT, Y, Paint.W, Paint.H, Align.TopLeft, 4)
Paint.DrawText(sText, X + WT, Y, Paint.W, Paint.H, Align.TopLeft) Paint.DrawText(sText, X + WT, Y, Paint.W, Paint.H, Align.TopLeft)
@ -310,6 +309,7 @@ Public Sub DrawingArea_Draw()
Endif Endif
If ShowRemove And If $bHighlight Then If ShowRemove And If $bHighlight Then
Paint.FillRect(Paint.W - $hRemove.W - P - P \ 2, P \ 2, $hRemove.W + P, $hRemove.H + P, iBg)
Paint.DrawImage(If($bInsideRemove, $hRemove, $hRemoveGray), Paint.W - $hRemove.W - P, P) Paint.DrawImage(If($bInsideRemove, $hRemove, $hRemoveGray), Paint.W - $hRemove.W - P, P)
Endif Endif