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

Decode NSFirst/SecondAttribute properly. Implemented method which decodes the text in the XIB to the correct enumerated value

Browse source
This commit is contained in:
Gregory John Casamento 2020-06-14 09:18:52 -04:00
parent 1f20485073
commit f7b731a75e
1 changed files with 79 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
Source/GSXib5KeyedUnarchiver.m
View file

@ -60,6 +60,7 @@
#import "AppKit/NSTabView.h"
#import "AppKit/NSToolbarItem.h"
#import "AppKit/NSView.h"
#import "AppKit/NSLayoutConstraint.h"
#import "GSCodingFlags.h"
#define DEBUG_XIB5 0
@ -391,6 +392,8 @@ static NSArray *XmlBoolDefaultYes = nil;
@"decodeToolbarImageForElement:", @"NSToolbarItemImage",
@"decodeControlContentsForElement:", @"NSControlContents",
@"decodePathStyle:", @"NSPathStyle",
@"decodeFirstAttribute:", @"NSFirstAttribute",
@"decodeSecondAttribute:", @"NSSecondAttribute",
nil];
RETAIN(XmlKeyToDecoderSelectorMap);
@ -2784,6 +2787,82 @@ didStartElement: (NSString*)elementName
return num;
}
- (id) decodeConstraintAttribute: (id)obj
{
NSNumber *num = [NSNumber numberWithInteger: 0];
if ([obj isEqualToString: @"left"])
{
num = [NSNumber numberWithInteger: NSLayoutAttributeLeft];
}
else if ([obj isEqualToString: @"right"])
{
num = [NSNumber numberWithInteger: NSLayoutAttributeRight];
}
else if ([obj isEqualToString: @"top"])
{
num = [NSNumber numberWithInteger: NSLayoutAttributeTop];
}
else if ([obj isEqualToString: @"bottom"])
{
num = [NSNumber numberWithInteger: NSLayoutAttributeBottom];
}
else if ([obj isEqualToString: @"leading"])
{
num = [NSNumber numberWithInteger: NSLayoutAttributeLeading];
}
else if ([obj isEqualToString: @"trailing"])
{
num = [NSNumber numberWithInteger: NSLayoutAttributeTrailing];
}
else if ([obj isEqualToString: @"width"])
{
num = [NSNumber numberWithInteger: NSLayoutAttributeWidth];
}
else if ([obj isEqualToString: @"height"])
{
num = [NSNumber numberWithInteger: NSLayoutAttributeHeight];
}
else if ([obj isEqualToString: @"centerX"])
{
num = [NSNumber numberWithInteger: NSLayoutAttributeCenterX];
}
else if ([obj isEqualToString: @"centerY"])
{
num = [NSNumber numberWithInteger: NSLayoutAttributeCenterY];
}
else if ([obj isEqualToString: @"lastBaseline"])
{
num = [NSNumber numberWithInteger: NSLayoutAttributeLastBaseline];
}
else if ([obj isEqualToString: @"baseline"])
{
num = [NSNumber numberWithInteger: NSLayoutAttributeBaseline];
}
else if ([obj isEqualToString: @"firstBaseline"])
{
num = [NSNumber numberWithInteger: NSLayoutAttributeFirstBaseline];
}
else if ([obj isEqualToString: @"notAnAttribute"])
{
num = [NSNumber numberWithInteger: NSLayoutAttributeNotAnAttribute];
}
return num;
}
- (id) decodeFirstAttribute: (GSXibElement *)element
{
id obj = [element attributeForKey: @"firstAttribute"];
return [self decodeConstraintAttribute: obj];
}
- (id) decodeSecondAttribute: (GSXibElement *)element
{
id obj = [element attributeForKey: @"secondAttribute"];
return [self decodeConstraintAttribute: obj];
}
- (id) objectForXib: (GSXibElement*)element
{
id object = [super objectForXib: element];