gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 13:20:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add priority to copy, correct encoding and decoding.

Browse source
This commit is contained in:
Gregory John Casamento 2020-06-09 07:34:40 -04:00
parent bf3bc1668e
commit fb3f9f5fe3
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Source/NSLayoutConstraint.m
View file

@ -341,6 +341,11 @@ static NSMutableArray *activeConstraints;
return _priority;
}
- (void) setPriority: (NSLayoutPriority)priority
{
_priority = priority;
}
// Coding...
- (instancetype) initWithCoder: (NSCoder *)coder
{
@ -376,11 +381,11 @@ static NSMutableArray *activeConstraints;
if ([coder containsValueForKey: @"NSPriority"])
{
_priority = [coder decodeIntegerForKey: @"NSPriority"];
_priority = [coder decodeFloatForKey: @"NSPriority"];
}
else
{
_priority = 1000; // if it is not present, this defaults to 1000... per testing with Cocoa.
_priority = NSLayoutPriorityRequired; // if it is not present, this defaults to 1000... per testing with Cocoa.
}
}
else
@ -390,10 +395,10 @@ static NSMutableArray *activeConstraints;
[coder decodeValueOfObjCType: @encode(NSUInteger)
at: &_firstAttribute];
_firstItem = [coder decodeObject];
[coder decodeValueOfObjCType: @encode(float)
[coder decodeValueOfObjCType: @encode(NSUInteger)
at: &_secondAttribute];
_secondItem = [coder decodeObject];
[coder decodeValueOfObjCType: @encode(NSUInteger)
[coder decodeValueOfObjCType: @encode(float)
at: &_priority];
}
}
@ -422,7 +427,7 @@ static NSMutableArray *activeConstraints;
forKey: @"NSSecondAttribute"];
[coder encodeObject: _secondItem
forKey: @"NSSecondItem"];
[coder encodeInteger: _priority
[coder encodeFloat: _priority
forKey: @"NSPriority"];
}
else
@ -432,10 +437,10 @@ static NSMutableArray *activeConstraints;
[coder encodeValueOfObjCType: @encode(NSUInteger)
at: &_firstAttribute];
[coder encodeObject: _firstItem];
[coder encodeValueOfObjCType: @encode(float)
[coder encodeValueOfObjCType: @encode(NSUInteger)
at: &_secondAttribute];
[coder encodeObject: _secondItem];
[coder encodeValueOfObjCType: @encode(NSUInteger)
[coder encodeValueOfObjCType: @encode(float)
at: &_priority];
}
}
@ -450,6 +455,7 @@ static NSMutableArray *activeConstraints;
attribute: _secondAttribute
multiplier: _multiplier
constant: _constant];
[constraint setPriority: [self priority]];
return constraint;
}