Merge branch 'master' of github.com:NativeScript/NativeScript

This commit is contained in:
Martin Guillon
2021-09-30 09:23:34 +02:00
26 changed files with 154 additions and 36 deletions

View File

@@ -1,5 +1,5 @@
<Page>
<GridLayout rows="*,*,*,*,*,*" >
<GridLayout rows="*,*,*,*,*,*,*,*,*,*,*,*,*" >
<Button backgroundImage="url('~/resources/images/no-image.png')"
borderRadius='125' borderWidth='2' borderColor='black'
backgroundRepeat="repeat" backgroundSize="contain"
@@ -25,5 +25,35 @@
backgroundSize="contain"
height="80" width="180"
/>
<!-- Test some invalid cases - these should not crash -->
<Button row="6" backgroundImage="url('res://theneverfoundunicorn.png')"
borderRadius='10' borderWidth='2' borderColor='black'
height="80" width="180"
/>
<Button row="7" backgroundImage="url('res://')"
borderRadius='10' borderWidth='2' borderColor='black'
height="80" width="180"
/>
<Button row="8" backgroundImage="url('')"
borderRadius='10' borderWidth='2' borderColor='black'
height="80" width="180"
/>
<Button row="9" backgroundImage="res://theneverfoundunicorn.png"
borderRadius='10' borderWidth='2' borderColor='black'
height="80" width="180"
/>
<Button row="10" backgroundImage="res://"
borderRadius='10' borderWidth='2' borderColor='black'
height="80" width="180"
/>
<Button row="11" backgroundImage=" "
borderRadius='10' borderWidth='2' borderColor='black'
height="80" width="180"
/>
<Button row="12" backgroundImage="bad"
borderRadius='10' borderWidth='2' borderColor='black'
height="80" width="180"
/>
</GridLayout>
</Page>

View File

@@ -12,6 +12,8 @@
<Image src="res://theneverfoundunicorn.png" margin="1" width="30" height="30" backgroundColor="yellow" />
<Image src="res://testlogo" margin="1" width="30" height="30" backgroundColor="yellow" />
<Image src="res://" margin="1" width="30" height="30" backgroundColor="yellow" />
<Image src="null" margin="1" width="30" height="30" backgroundColor="yellow" />
<Image src="res://theneverfoundunicorn.png" margin="1" width="30" height="30" backgroundColor="yellow" borderRadius="10" />
<Image src="res://testlogo" margin="1" width="30" height="30" backgroundColor="yellow" borderRadius="10" />