Skip to content

Commit

Permalink
missed a few files from prior merge
Browse files Browse the repository at this point in the history
  • Loading branch information
Paul Colton committed Mar 7, 2014
1 parent 6bb76af commit c28dad2
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 1 deletion.
2 changes: 2 additions & 0 deletions src/Core/PixateFreestyleConfiguration.m
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ @implementation PixateFreestyleConfiguration
NSArray *_styleClasses;
}

@synthesize styleChangeable;

#ifdef PX_LOGGING
static int ddLogLevel = LOG_LEVEL_WARN;

Expand Down
3 changes: 2 additions & 1 deletion src/Core/Styling/Cache/PXStyleInfo.m
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ + (PXStyleInfo *)styleInfoForStyleable:(id<PXStyleable>)styleable
+ (PXStyleInfo *)styleInfoForStyleable:(id<PXStyleable>)styleable checkPseudoClassFunction:(NSNumber**)checkPseudoClassFunction
{
PXStyleInfo *result = [[PXStyleInfo alloc] initWithStyleKey:styleable.styleKey];

result.changeable = styleable.styleChangeable;

// find all rule sets that apply to this styleable
NSMutableArray *ruleSets = [PXStyleUtils matchingRuleSetsForStyleable:styleable];

Expand Down
5 changes: 5 additions & 0 deletions src/Core/Styling/PXStyleable.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@ typedef enum
*/
@property (nonatomic, readonly) NSArray *styleClasses;

/**
* For support in cache, programing change style or class style
*/
@property (nonatomic) BOOL styleChangeable;

/**
* The styling mode of the styleable as defined by the PXStylingMode enumeration.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ @implementation PXVirtualStyleableControl

@synthesize styleId;
@synthesize styleCSS;
@synthesize styleChangeable;
@synthesize styleMode = _styleMode;
@synthesize pxStyleElementName = _name;
@synthesize pxStyleParent = _parent;
Expand Down

0 comments on commit c28dad2

Please sign in to comment.