gnustep/apps-gorm
0
0
Fork 0
mirror of https://github.com/gnustep/apps-gorm.git synced 2025-04-22 22:20:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve handling of switch/checkmark

Browse source
This commit is contained in:
Gregory John Casamento 2023-08-26 10:50:05 -04:00
parent 36ffbfb84b
commit bffd2246ba
1 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
GormCore/Plugins/Xib/GormXIBModelGenerator.m
View file

@ -84,7 +84,15 @@ static NSUInteger _count = INT_MAX;
BOOL imageDimsWhenDisabled = [self imageDimsWhenDisabled];
NSString *imageName = [[self image] name];
if ((highlightsBy | NSChangeBackgroundCellMask)
if ([imageName isEqualToString: @"GSSwitch"])
{
type = NSSwitchButton;
}
else if ([imageName isEqualToString: @"NSRadioButton"])
{
type = NSRadioButton;
}
else if ((highlightsBy | NSChangeBackgroundCellMask)
&& (showsStateBy | NSNoCellMask)
&& (imageDimsWhenDisabled == YES))
{
@ -114,14 +122,6 @@ static NSUInteger _count = INT_MAX;
{
type = NSOnOffButton;
}
else if ([imageName isEqualToString: @"NSSwitch"])
{
type = NSSwitchButton;
}
else if ([imageName isEqualToString: @"NSRadioButton"])
{
type = NSRadioButton;
}
return type;
}
@ -152,7 +152,7 @@ static NSUInteger _count = INT_MAX;
result = @"toggle";
break;
case NSSwitchButton:
result = @"switch";
result = @"check";
break;
case NSRadioButton:
result = @"radio";
@ -841,6 +841,12 @@ static NSUInteger _count = INT_MAX;
attr = [NSXMLNode attributeWithName: @"type" stringValue: buttonTypeString];
[elem addAttribute: attr];
if ([buttonTypeString isEqualToString: @"check"])
{
attr = [NSXMLNode attributeWithName: @"imagePosition" stringValue: @"left"];
[elem addAttribute: attr];
}
}
- (void) _addAlignment: (NSUInteger)alignment toElement: (NSXMLElement *)elem
@ -880,9 +886,6 @@ static NSUInteger _count = INT_MAX;
if ([obj isKindOfClass: [NSButtonCell class]])
{
NSBezelStyle bezel = (NSBezelStyle)[obj bezelStyle] - 1;
NSLog(@"bezel = %u", bezel);
NSArray *bezelTypeArray = [NSArray arrayWithObjects:
@"rounded",
@"regularSquare",