Merge pull request #2765 from Txink/Fix-Transform

Support "wx" in Transform.translate
apache · Aug 1, 2019 · b943ea4 · b943ea4
2 parents 75d1004 + ca289f4
commit b943ea4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXTransform.m b/ios/sdk/WeexSDK/Sources/Component/WXTransform.m
@@ -369,7 +369,7 @@ - (void)parseTranslatex:(NSArray *)value
     if ([value[0] hasSuffix:@"%"]) {
         translateX = [WXLength lengthWithFloat:x type:WXLengthTypePercent];
     } else {
-        x = WXPixelScale(x, self.weexInstance.pixelScaleFactor);
+        x = [WXConvert WXPixelType:value[0] scaleFactor:self.weexInstance.pixelScaleFactor];
         translateX = [WXLength lengthWithFloat:x type:WXLengthTypeFixed];
     }
     _translateX = translateX;
@@ -382,7 +382,7 @@ - (void)parseTranslatey:(NSArray *)value
     if ([value[0] hasSuffix:@"%"]) {
         translateY = [WXLength lengthWithFloat:y type:WXLengthTypePercent];
     } else {
-        y = WXPixelScale(y, self.weexInstance.pixelScaleFactor);
+        y = [WXConvert WXPixelType:value[0] scaleFactor:self.weexInstance.pixelScaleFactor];
         translateY = [WXLength lengthWithFloat:y type:WXLengthTypeFixed];
     }
     _translateY = translateY;