when styling non-recursively, still update virtual children

Paul Colton · Paul Colton · commit c62f42c5be0f · 2014-03-20T11:11:57.000-07:00
diff --git a/src/Core/Styling/Categories/UIView+PXStyling.m b/src/Core/Styling/Categories/UIView+PXStyling.m
@@ -445,22 +445,19 @@ + (void)updateStyles:(id<PXStyleable>)styleable recursively:(bool)recurse
 {
     if (styleable.styleMode == PXStylingNormal)
     {
-        if(recurse)
+        for (id<PXStyleable> child in styleable.pxStyleChildren)
         {
-            for (id<PXStyleable> child in styleable.pxStyleChildren)
+            if ([child conformsToProtocol:@protocol(PXVirtualControl)] && child.styleMode == PXStylingNormal)
             {
-                if ([child conformsToProtocol:@protocol(PXVirtualControl)] && child.styleMode == PXStylingNormal)
+                [PXStyleUtils enumerateStyleableDescendants:child usingBlock:^(id<PXStyleable> styleable, BOOL *stop, BOOL *stopDescending)
                 {
-                    [PXStyleUtils enumerateStyleableDescendants:child usingBlock:^(id<PXStyleable> styleable, BOOL *stop, BOOL *stopDescending)
+                    if ([styleable conformsToProtocol:@protocol(PXVirtualControl)] && styleable.styleMode == PXStylingNormal)
                     {
-                        if ([styleable conformsToProtocol:@protocol(PXVirtualControl)] && styleable.styleMode == PXStylingNormal)
-                        {
-                            [PXStyleUtils updateStyleForStyleable:styleable];
-                        }
-                    }];
-                    
-                    [PXStyleUtils updateStyleForStyleable:child];
-                }
+                        [PXStyleUtils updateStyleForStyleable:styleable];
+                    }
+                }];
+                
+                [PXStyleUtils updateStyleForStyleable:child];
             }
         }
         

Original file line number	Diff line number	Diff line change
`@@ -445,22 +445,19 @@ + (void)updateStyles:(id<PXStyleable>)styleable recursively:(bool)recurse`
`445`	`445`	`{`
`446`	`446`	`if (styleable.styleMode == PXStylingNormal)`
`447`	`447`	`{`
`448`		`- if(recurse)`
	`448`	`+ for (id<PXStyleable> child in styleable.pxStyleChildren)`
`449`	`449`	`{`
`450`		`- for (id<PXStyleable> child in styleable.pxStyleChildren)`
	`450`	`+ if ([child conformsToProtocol:@protocol(PXVirtualControl)] && child.styleMode == PXStylingNormal)`
`451`	`451`	`{`
`452`		`- if ([child conformsToProtocol:@protocol(PXVirtualControl)] && child.styleMode == PXStylingNormal)`
	`452`	`+ [PXStyleUtils enumerateStyleableDescendants:child usingBlock:^(id<PXStyleable> styleable, BOOL stop, BOOL stopDescending)`
`453`	`453`	`{`
`454`		`- [PXStyleUtils enumerateStyleableDescendants:child usingBlock:^(id<PXStyleable> styleable, BOOL stop, BOOL stopDescending)`
	`454`	`+ if ([styleable conformsToProtocol:@protocol(PXVirtualControl)] && styleable.styleMode == PXStylingNormal)`
`455`	`455`	`{`
`456`		`- if ([styleable conformsToProtocol:@protocol(PXVirtualControl)] && styleable.styleMode == PXStylingNormal)`
`457`		`- {`
`458`		`- [PXStyleUtils updateStyleForStyleable:styleable];`
`459`		`- }`
`460`		`- }];`
`461`		`-`
`462`		`- [PXStyleUtils updateStyleForStyleable:child];`
`463`		`- }`
	`456`	`+ [PXStyleUtils updateStyleForStyleable:styleable];`
	`457`	`+ }`
	`458`	`+ }];`
	`459`	`+`
	`460`	`+ [PXStyleUtils updateStyleForStyleable:child];`
`464`	`461`	`}`
`465`	`462`	`}`
`466`	`463`