comparison ios/dw.m @ 2459:ddc6d49d1110

iOS: Reorganize the code so retval doesn't get clobbered without the returns.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Wed, 14 Apr 2021 01:27:00 +0000
parents 689261c29745
children 79c7bf492bc1
comparison
equal deleted inserted replaced
2458:689261c29745 2459:ddc6d49d1110
1234 } 1234 }
1235 } 1235 }
1236 -(void)getUserInterfaceStyle:(id)param 1236 -(void)getUserInterfaceStyle:(id)param
1237 { 1237 {
1238 NSMutableArray *array = param; 1238 NSMutableArray *array = param;
1239 UIUserInterfaceStyle style = [hiddenWindow overrideUserInterfaceStyle]; 1239 UIUserInterfaceStyle overridestyle = [hiddenWindow overrideUserInterfaceStyle];
1240 int retval; 1240 int retval;
1241 1241
1242 switch(style) 1242 switch(overridestyle)
1243 { 1243 {
1244 case UIUserInterfaceStyleLight: 1244 case UIUserInterfaceStyleLight:
1245 retval = DW_DARK_MODE_DISABLED; 1245 retval = DW_DARK_MODE_DISABLED;
1246 break; 1246 break;
1247 case UIUserInterfaceStyleDark: 1247 case UIUserInterfaceStyleDark:
1248 retval = DW_DARK_MODE_FORCED; 1248 retval = DW_DARK_MODE_FORCED;
1249 break; 1249 break;
1250 default: /* UIUserInterfaceStyleUnspecified */ 1250 default: /* UIUserInterfaceStyleUnspecified */
1251 style = [[[hiddenWindow rootViewController] traitCollection] userInterfaceStyle]; 1251 {
1252 } 1252 UIUserInterfaceStyle style = [[[hiddenWindow rootViewController] traitCollection] userInterfaceStyle];
1253 switch(style) 1253
1254 { 1254 switch(style)
1255 case UIUserInterfaceStyleLight: 1255 {
1256 retval = DW_DARK_MODE_BASIC; 1256 case UIUserInterfaceStyleLight:
1257 break; 1257 retval = DW_DARK_MODE_BASIC;
1258 case UIUserInterfaceStyleDark: 1258 break;
1259 retval = DW_DARK_MODE_FULL; 1259 case UIUserInterfaceStyleDark:
1260 break; 1260 retval = DW_DARK_MODE_FULL;
1261 default: /* UIUserInterfaceStyleUnspecified */ 1261 break;
1262 retval = DW_FEATURE_UNSUPPORTED; 1262 default: /* UIUserInterfaceStyleUnspecified */
1263 break; 1263 retval = DW_FEATURE_UNSUPPORTED;
1264 break;
1265 }
1266 }
1264 } 1267 }
1265 [array addObject:[NSNumber numberWithInt:retval]]; 1268 [array addObject:[NSNumber numberWithInt:retval]];
1266 } 1269 }
1267 -(void)setUserInterfaceStyle:(id)param 1270 -(void)setUserInterfaceStyle:(id)param
1268 { 1271 {