diff --git a/app/src/gambas3/.src/Component/CSymbolInfo.class b/app/src/gambas3/.src/Component/CSymbolInfo.class index 8e6e9ecd8..750f2a158 100644 --- a/app/src/gambas3/.src/Component/CSymbolInfo.class +++ b/app/src/gambas3/.src/Component/CSymbolInfo.class @@ -683,6 +683,7 @@ Static Public Function TransformSignature(sSign As String, bBalise As Boolean) A Dim sBold As String Dim sNoBold As String + Dim sName As String If bBalise Then sBold = "" @@ -715,7 +716,12 @@ Static Public Function TransformSignature(sSign As String, bBalise As Boolean) A sRes = sRes & sBold & "," & sNoBold & " " Endif - sRes = sRes & Mid$(sSign, iInd + 1, iPos - iInd - 1) & " " & sBold & "AS" & sNoBold & " " + sName = Mid$(sSign, iInd + 1, iPos - iInd - 1) + If sName Begins "&" Then + sRes &= sBold & "BYREF" & sNoBold & " " + sName = Mid$(sName, 2) + Endif + sRes &= sName & " " & sBold & "AS" & sNoBold & " " iInd = iPos bName = True diff --git a/app/src/gambas3/.src/Project/Component/FComponentChooser.class b/app/src/gambas3/.src/Project/Component/FComponentChooser.class index aa79dc675..4152534ff 100644 --- a/app/src/gambas3/.src/Project/Component/FComponentChooser.class +++ b/app/src/gambas3/.src/Project/Component/FComponentChooser.class @@ -37,7 +37,7 @@ Public Sub _new() 'gvwComponent.Padding = 4 gvwComponent.Columns.Count = 5 - gvwComponent.Columns[0].Width = 24 + gvwComponent.Columns[0].Width = 16 'gvwComponent.Columns[0].Expand = False 'gvwComponent.Columns[1].Expand = False gvwComponent.Columns[2].Expand = True @@ -222,7 +222,7 @@ Public Sub gvwComponent_Data(Row As Integer, Column As Integer) ' Endif Case 1 - .Text = hComp.Key + .Text = hComp.Key & " " .Font.Bold = True Case 2 @@ -782,6 +782,8 @@ End Public Sub gvwComponent_Draw(X As Integer, Y As Integer, Width As Integer, Height As Integer, Row As Integer, Column As Integer) Dim sComp As String = $aComp[Row] + Dim DX As Integer + 'Dim hComp As CComponent = CComponent.All[sComp] If Not IsCheckable() Then Return @@ -790,8 +792,10 @@ Public Sub gvwComponent_Draw(X As Integer, Y As Integer, Width As Integer, Heigh Case 0 - X += (Width - 16) \ 2 - Y += (Height - 16) \ 2 + DX = (Width - 16) \ 2 + X += DX + Y += DX + 'Y += (gvwComponent.Rows.Height - gvwComponent.Padding * 2 - 16) \ 2 Width = 16 Height = 16 diff --git a/app/src/gambas3/.src/Project/FProjectProperty.class b/app/src/gambas3/.src/Project/FProjectProperty.class index ad8240817..ce2f938cb 100644 --- a/app/src/gambas3/.src/Project/FProjectProperty.class +++ b/app/src/gambas3/.src/Project/FProjectProperty.class @@ -888,7 +888,7 @@ Public Sub ipnProject_Click() Select Case ipnProject.Text Case ("Components") - choComponent.SetFocus + 'choComponent.SetFocus choComponent.HideBrowser btnReset.Show Case ("Libraries") diff --git a/app/src/gambas3/.src/VersionControl/VersionControl.module b/app/src/gambas3/.src/VersionControl/VersionControl.module index e55c1def1..584710ddd 100644 --- a/app/src/gambas3/.src/VersionControl/VersionControl.module +++ b/app/src/gambas3/.src/VersionControl/VersionControl.module @@ -367,11 +367,10 @@ Public Sub Update() Next Project.Workspace.Unlock - If aRemove.Count Then - - Project.Reload + Project.Reload + + If aRemove.Count Then FMain.DoFilter(Project.FILTER_CONFLICT) - Endif End