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

Reenable userDefinedRuntimeAttribute handling that got lost.

Browse source 
Correct releasing of reference elements.
Add more font attributes and get the values from NSFont.
This commit is contained in:
fredkiefer 2019-12-22 13:46:50 +01:00
parent cbda1229ed
commit 5c9c641113
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Source/GSXib5KeyedUnarchiver.m
View file

@ -314,7 +314,8 @@ static NSString *ApplicationClass = nil;
[self setValue: [coder decodeObjectForKey: @"value"]];
else if ([@"nil" isEqualToString: typeIdentifier])
[self setValue: nil];
NSWarnMLog(@"type: %@ value: %@ (%@)", typeIdentifier, value, [value class]);
else
NSWarnMLog(@"type: %@ value: %@ (%@)", typeIdentifier, value, [value class]);
}
}
@ -374,6 +375,7 @@ static NSArray *XmlBoolDefaultYes = nil;
@"NSWindowTemplate5", @"window",
@"NSView", @"tableCellView",
@"NSImage", @"image",
@"IBUserDefinedRuntimeAttribute5", @"userDefinedRuntimeAttribute",
nil];
RETAIN(XmltagToObjectClassCrossReference);
@ -720,7 +722,6 @@ static NSArray *XmlBoolDefaultYes = nil;
RELEASE(parent);
RELEASE(children);
RELEASE(reference);
return AUTORELEASE(objectRecord);
}
@ -769,7 +770,6 @@ static NSArray *XmlBoolDefaultYes = nil;
RELEASE(stringRecord);
RELEASE(placeholderRec);
RELEASE(placeStringRec);
RELEASE(referenceRec);
RELEASE(objectRecord);
}
}
@ -972,7 +972,7 @@ didStartElement: (NSString*)elementName
if ([attributes objectForKey: @"reference"])
{
element = [self createReference: [attributes objectForKey: @"reference"]];
element = RETAIN([self createReference: [attributes objectForKey: @"reference"]]);
}
else
{
@ -1624,15 +1624,19 @@ didStartElement: (NSString*)elementName
size = 13;
if ([metaFont containsString: @"mini"])
size = 9;
size = [NSFont systemFontSizeForControlSize: NSMiniControlSize];
else if ([metaFont containsString: @"small"])
size = 11;
size = [NSFont smallSystemFontSize];
else if ([metaFont containsString: @"medium"])
size = 12;
else if ([metaFont containsString: @"menu"])
size = 13;
else if ([metaFont containsString: @"system"])
else if ([metaFont containsString: @"controlcontent"])
size = 13;
else if ([metaFont containsString: @"label"])
size = [NSFont labelFontSize];
else if ([metaFont containsString: @"system"])
size = [NSFont systemFontSize];
else if (metaFont)
NSWarnMLog(@"unknown meta font value: %@", metaFont);
}