Fix: CSS background-image on Label not loading in iOS

hamorphis · hamorphis · commit fc39fad959cb · 2016-07-21T09:45:50.000+03:00
Resolves NativeScript#2414
diff --git a/apps/app/ui-tests-app/css/label-background-image.css b/apps/app/ui-tests-app/css/label-background-image.css
@@ -0,0 +1,8 @@
+Label {
+    background-image: url('~/ui-tests-app/pages/test2.png');
+    background-repeat: no-repeat; 
+    background-position: left; 
+    background-size: contain; 
+    margin: 10; 
+    border-width: 1;
+}
diff --git a/apps/app/ui-tests-app/css/label-background-image.xml b/apps/app/ui-tests-app/css/label-background-image.xml
@@ -0,0 +1,7 @@
+<Page>
+    <StackLayout>
+        <Label text="Label1"/>
+        <Label text="Label2" width="150" height="200" />
+        <Label text="Label3" width="200" height="150"/>
+    </StackLayout>
+</Page>
diff --git a/apps/app/ui-tests-app/css/main-page.ts b/apps/app/ui-tests-app/css/main-page.ts
@@ -24,6 +24,7 @@ export function pageLoaded(args: EventData) {
     examples.set("zindex", "css/zindex");
     examples.set("clipPath", "css/clip-path");
     examples.set("padding", "css/padding");
+    examples.set("label-background-image", "css/label-background-image");
 
     let viewModel = new SubMianPageViewModel(wrapLayout, examples);
     page.bindingContext = viewModel;
diff --git a/apps/app/ui-tests-app/web-view/web-view-test.xml b/apps/app/ui-tests-app/web-view/web-view-test.xml
@@ -3,7 +3,7 @@
   
     <!-- WebView: local and string -->
     <WebView src="~/ui-tests-app/web-view/test.html" height="50" />
-    <WebView src="&lt;html&gt;&lt;body&gt;&lt;img src='./pages/test2.png'&gt;&lt;/img&gt;&lt;/body&gt;&lt;/html&gt;" height="75" />
+    <WebView src="&lt;html&gt;&lt;body&gt;&lt;img src='./ui-tests-app/pages/test2.png'&gt;&lt;/img&gt;&lt;/body&gt;&lt;/html&gt;" height="75" />
     
     <!-- Resources: png and jpg -->
     <WrapLayout>
diff --git a/apps/package.json b/apps/package.json
@@ -9,7 +9,7 @@
       "version": "2.1.1"
     },
     "tns-ios": {
-      "version": "2.1.0"
+      "version": "2.1.1"
     }
   },
   "dependencies": {
diff --git a/tns-core-modules/ui/styling/background.ios.ts b/tns-core-modules/ui/styling/background.ios.ts
@@ -94,7 +94,7 @@ export module ios {
         UIGraphicsBeginImageContextWithOptions(originalImage.size, false, 0.0);
         var context = UIGraphicsGetCurrentContext();
         CGContextSaveGState(context);
-        CGContextTranslateCTM(context, 0.0, originalImage.size.width);
+        CGContextTranslateCTM(context, 0.0, originalImage.size.height);
         CGContextScaleCTM(context, 1.0, -1.0);
         originalImage.drawInRect(CGRectMake(0, 0, originalImage.size.width, originalImage.size.height))
         CGContextRestoreGState(context);

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`"version": "2.1.1"`
`10`	`10`	`},`
`11`	`11`	`"tns-ios": {`
`12`		`- "version": "2.1.0"`
	`12`	`+ "version": "2.1.1"`
`13`	`13`	`}`
`14`	`14`	`},`
`15`	`15`	`"dependencies": {`