You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ac...@apache.org on 2018/01/02 07:51:09 UTC
incubator-weex git commit: * [iOS] revert cancel round pixel
Repository: incubator-weex
Updated Branches:
refs/heads/master dc4284430 -> d724832ff
* [iOS] revert cancel round pixel
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/d724832f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d724832f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d724832f
Branch: refs/heads/master
Commit: d724832ff8a35f83d6a8de8049eedb446cac0d62
Parents: dc42844
Author: acton393 <zh...@gmail.com>
Authored: Tue Jan 2 15:50:52 2018 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Tue Jan 2 15:50:52 2018 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 4 ---
ios/sdk/WeexSDK/Sources/Utility/WXUtility.h | 3 --
ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 32 ++++------------------
3 files changed, 6 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d724832f/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
index 581c16d..ec069ea 100644
--- a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
+++ b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
@@ -226,10 +226,6 @@ typedef enum : NSUInteger {
BOOL useCoreText = [[configCenter configForKey:@"iOS_weex_ext_config.text_render_useCoreText" defaultValue:@YES isDefault:NULL] boolValue];
[WXTextComponent setRenderUsingCoreText:useCoreText];
- //handler pixel round
- BOOL shouldRoudPixel = [[configCenter configForKey:@"iOS_weex_ext_config.utilityShouldRoundPixel" defaultValue:@(YES) isDefault:NULL] boolValue];
- [WXUtility setShouldRoudPixel:shouldRoudPixel];
-
id sliderConfig = [configCenter configForKey:@"iOS_weex_ext_config.slider_class_name" defaultValue:@"WXCycleSliderComponent" isDefault:NULL];
if(sliderConfig){
NSString *sliderClassName = [WXConvert NSString:sliderConfig];
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d724832f/ios/sdk/WeexSDK/Sources/Utility/WXUtility.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXUtility.h b/ios/sdk/WeexSDK/Sources/Utility/WXUtility.h
index acf248e..6577479 100644
--- a/ios/sdk/WeexSDK/Sources/Utility/WXUtility.h
+++ b/ios/sdk/WeexSDK/Sources/Utility/WXUtility.h
@@ -459,7 +459,4 @@ BOOL WXFloatGreaterThanWithPrecision(CGFloat a,CGFloat b,double precision);
*/
+ (NSData *_Nonnull)base64DictToData:(NSDictionary *_Nullable)base64Dict;
-
-+ (void)setShouldRoudPixel:(BOOL)shouldRoundPixel;
-
@end
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d724832f/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m b/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m
index bb97607..a96bd84 100644
--- a/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m
+++ b/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m
@@ -41,8 +41,6 @@
#define KEY_PASSWORD @"com.taobao.Weex.123456"
#define KEY_USERNAME_PASSWORD @"com.taobao.Weex.weex123456"
-static BOOL utilityShouldRoundPixel = NO;
-
void WXPerformBlockOnMainThread(void (^ _Nonnull block)(void))
{
if (!block) return;
@@ -119,29 +117,20 @@ CGFloat WXPixelScale(CGFloat value, CGFloat scaleFactor)
CGFloat WXRoundPixelValue(CGFloat value)
{
- if (utilityShouldRoundPixel) {
- CGFloat scale = WXScreenScale();
- return round(value * scale) / scale;
- }
- return value;
+ CGFloat scale = WXScreenScale();
+ return round(value * scale) / scale;
}
CGFloat WXCeilPixelValue(CGFloat value)
{
- if (utilityShouldRoundPixel) {
- CGFloat scale = WXScreenScale();
- return ceil(value * scale) / scale;
- }
- return value;
+ CGFloat scale = WXScreenScale();
+ return ceil(value * scale) / scale;
}
CGFloat WXFloorPixelValue(CGFloat value)
{
- if (utilityShouldRoundPixel) {
- CGFloat scale = WXScreenScale();
- return floor(value * scale) / scale;
- }
- return value;
+ CGFloat scale = WXScreenScale();
+ return floor(value * scale) / scale;
}
@implementation WXUtility
@@ -165,15 +154,6 @@ CGFloat WXFloorPixelValue(CGFloat value)
block();
}
-+ (void)setShouldRoudPixel:(BOOL)shouldRoundPixel
-{
- utilityShouldRoundPixel = shouldRoundPixel;
-}
-+ (BOOL)shouldRoudPixel
-{
- return utilityShouldRoundPixel;
-}
-
+ (NSDictionary *)getEnvironment
{
NSString *platform = @"iOS";