comparison ios/dw.m @ 2424:6b302a8c856f

iOS: Fix checked image not showing due to typo in image name. Also refactor so it is a bit easier to debug.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Sun, 04 Apr 2021 15:40:25 +0000
parents b4cb136b5222
children 60a459df758d
comparison
equal deleted inserted replaced
2423:b4cb136b5222 2424:6b302a8c856f
1392 -(DWBox *)parent { return parent; } 1392 -(DWBox *)parent { return parent; }
1393 -(int)type { return type; } 1393 -(int)type { return type; }
1394 -(void)setType:(int)input { type = input; [self updateImage]; } 1394 -(void)setType:(int)input { type = input; [self updateImage]; }
1395 -(void)updateImage 1395 -(void)updateImage
1396 { 1396 {
1397 UIImage *image = nil; 1397 NSString *imagename = nil;
1398 1398
1399 switch(type) 1399 switch(type)
1400 { 1400 {
1401 case _DW_BUTTON_TYPE_CHECK: 1401 case _DW_BUTTON_TYPE_CHECK:
1402 { 1402 {
1403 1403
1404 if(state) 1404 if(state)
1405 image = [UIImage systemImageNamed:@"checkbox.square"]; 1405 imagename = @"checkmark.square";
1406 else 1406 else
1407 image = [UIImage systemImageNamed:@"square"]; 1407 imagename = @"square";
1408 } 1408 }
1409 break; 1409 break;
1410 case _DW_BUTTON_TYPE_RADIO: 1410 case _DW_BUTTON_TYPE_RADIO:
1411 { 1411 {
1412 if(state) 1412 if(state)
1413 image = [UIImage systemImageNamed:@"largecircle.fill.circle"]; 1413 imagename = @"largecircle.fill.circle";
1414 else 1414 else
1415 image = [UIImage systemImageNamed:@"circle"]; 1415 imagename = @"circle";
1416 } 1416 }
1417 break; 1417 break;
1418 } 1418 }
1419 if(image) 1419 if(imagename)
1420 { 1420 {
1421 UIImage *image = [UIImage systemImageNamed:imagename];
1421 CGSize size = [image size]; 1422 CGSize size = [image size];
1422 [self setImage:image forState:UIControlStateNormal]; 1423 [self setImage:image forState:UIControlStateNormal];
1423 [self setTitleEdgeInsets:UIEdgeInsetsMake(0,size.width,0,0)]; 1424 [self setTitleEdgeInsets:UIEdgeInsetsMake(0,size.width,0,0)];
1424 } 1425 }
1425 } 1426 }