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

Fix how Picture[] interprets relative paths.

Browse source 
[GB.GUI.BASE]
* BUG: Fix how Picture[] interprets relative paths.
This commit is contained in:
gambas 2020-01-14 14:19:41 +01:00
parent ba221177da
commit 2deeab7410
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
comp/src/gb.gui.base/.src/Picture.class
View file

@ -48,6 +48,7 @@ Static Public Sub _get(Path As String) As Picture
Dim sPath As String
Dim sBaseName As String
Dim sDarkPath As String
Dim bMoveUp As Boolean
If Not Path Then Return
@ -65,8 +66,17 @@ Static Public Sub _get(Path As String) As Picture
sPath = Path
If File.IsRelative(sPath) And If sPath Not Begins "./" Then sPath = ".." &/ sPath
'Debug Path;; System.Backtrace.Join(" ")
If File.IsRelative(sPath) Then
If sPath Begins "./" Then
If sPath Not Begins "./gb." Then
bMoveUp = True
Endif
Else
bMoveUp = True
Endif
Endif
If bMoveUp Then sPath = ".." &/ sPath
' Support for rtl/ltr icons