Mercurial > dwindows
comparison ios/dw.m @ 2395:2618277de356
iOS: Code error cleanup reported by LLVM.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Thu, 25 Mar 2021 09:04:59 +0000 |
parents | 6669e152e30b |
children | 5bb3491ceba2 |
comparison
equal
deleted
inserted
replaced
2394:e0c63f2cbdbf | 2395:2618277de356 |
---|---|
867 @end | 867 @end |
868 | 868 |
869 @implementation DWObject | 869 @implementation DWObject |
870 -(id)init | 870 -(id)init |
871 { | 871 { |
872 self = [super init]; | |
872 hiddenWindow = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]]; | 873 hiddenWindow = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]]; |
873 [hiddenWindow setBackgroundColor:[UIColor clearColor]]; | 874 [hiddenWindow setBackgroundColor:[UIColor clearColor]]; |
874 [hiddenWindow setWindowLevel:UIWindowLevelAlert]; | 875 [hiddenWindow setWindowLevel:UIWindowLevelAlert]; |
875 [hiddenWindow setHidden:YES]; | 876 [hiddenWindow setHidden:YES]; |
876 return [super init]; | 877 return self; |
877 } | 878 } |
878 -(void)uselessThread:(id)sender { /* Thread only to initialize threading */ } | 879 -(void)uselessThread:(id)sender { /* Thread only to initialize threading */ } |
879 -(void)menuHandler:(id)param | 880 -(void)menuHandler:(id)param |
880 { | 881 { |
881 _dw_event_handler(param, nil, 8); | 882 _dw_event_handler(param, nil, 8); |
897 handler:^(UIAlertAction * action) { iResponse = 1; }]; | 898 handler:^(UIAlertAction * action) { iResponse = 1; }]; |
898 [alert addAction:action]; | 899 [alert addAction:action]; |
899 if([params count] > 4) | 900 if([params count] > 4) |
900 action = [UIAlertAction actionWithTitle:[params objectAtIndex:4] style:UIAlertActionStyleDefault | 901 action = [UIAlertAction actionWithTitle:[params objectAtIndex:4] style:UIAlertActionStyleDefault |
901 handler:^(UIAlertAction * action) { iResponse = 2; }]; | 902 handler:^(UIAlertAction * action) { iResponse = 2; }]; |
903 [alert addAction:action]; | |
902 if([params count] > 5) | 904 if([params count] > 5) |
903 action = [UIAlertAction actionWithTitle:[params objectAtIndex:5] style:UIAlertActionStyleDefault | 905 action = [UIAlertAction actionWithTitle:[params objectAtIndex:5] style:UIAlertActionStyleDefault |
904 handler:^(UIAlertAction * action) { iResponse = 3; }]; | 906 handler:^(UIAlertAction * action) { iResponse = 3; }]; |
907 [alert addAction:action]; | |
905 | 908 |
906 /* Unhide our hidden window and make it key */ | 909 /* Unhide our hidden window and make it key */ |
907 [hiddenWindow setHidden:NO]; | 910 [hiddenWindow setHidden:NO]; |
908 [hiddenWindow makeKeyAndVisible]; | 911 [hiddenWindow makeKeyAndVisible]; |
909 [[hiddenWindow rootViewController] presentViewController:alert animated:YES completion:nil]; | 912 [[hiddenWindow rootViewController] presentViewController:alert animated:YES completion:nil]; |
910 /* Once the dialog is gone we can rehide our window */ | 913 /* Once the dialog is gone we can rehide our window */ |
911 [hiddenWindow setHidden:YES]; | 914 [hiddenWindow setHidden:YES]; |
912 [alert release]; | |
913 [params addObject:[NSNumber numberWithInteger:iResponse]]; | 915 [params addObject:[NSNumber numberWithInteger:iResponse]]; |
914 } | 916 } |
915 -(void)safeCall:(SEL)sel withObject:(id)param | 917 -(void)safeCall:(SEL)sel withObject:(id)param |
916 { | 918 { |
917 if([self respondsToSelector:sel]) | 919 if([self respondsToSelector:sel]) |
1110 -(void)viewWillLayoutSubviews | 1112 -(void)viewWillLayoutSubviews |
1111 { | 1113 { |
1112 DWWindow *window = (DWWindow *)[[self view] window]; | 1114 DWWindow *window = (DWWindow *)[[self view] window]; |
1113 NSArray *array = [window subviews]; | 1115 NSArray *array = [window subviews]; |
1114 DWView *view = [array firstObject]; | 1116 DWView *view = [array firstObject]; |
1117 #if 0 | |
1115 id object = [array lastObject]; | 1118 id object = [array lastObject]; |
1116 /* Remove the UITransitionView... for testing purposes */ | 1119 /* Remove the UITransitionView... for testing purposes */ |
1117 if(![object isMemberOfClass:[DWView class]]) | 1120 if(![object isMemberOfClass:[DWView class]]) |
1118 [object removeFromSuperview]; | 1121 [object removeFromSuperview]; |
1122 #endif | |
1119 [view setFrame:[window frame]]; | 1123 [view setFrame:[window frame]]; |
1120 [view windowResized:[window frame].size]; | 1124 [view windowResized:[window frame].size]; |
1121 } | 1125 } |
1122 @end | 1126 @end |
1123 | 1127 |
2996 [object sizeToFit]; | 3000 [object sizeToFit]; |
2997 frame.size = [object bounds].size; | 3001 frame.size = [object bounds].size; |
2998 frame.size.width += 2.0; | 3002 frame.size.width += 2.0; |
2999 frame.size.height += 2.0; | 3003 frame.size.height += 2.0; |
3000 [sv setFrame:frame]; | 3004 [sv setFrame:frame]; |
3005 size = frame.size; | |
3001 } | 3006 } |
3002 else | 3007 else |
3003 size = [object getsize]; | 3008 size = [object getsize]; |
3004 | 3009 |
3005 thiswidth = size.width; | 3010 thiswidth = size.width; |
4640 id image = handle; | 4645 id image = handle; |
4641 UIImage *bi = nil; | 4646 UIImage *bi = nil; |
4642 bool bCanDraw = YES; | 4647 bool bCanDraw = YES; |
4643 | 4648 |
4644 if(pixmap) | 4649 if(pixmap) |
4645 bi = image = (id)pixmap->image; | 4650 bi = (id)pixmap->image; |
4646 else | 4651 else |
4647 { | 4652 { |
4648 if([image isMemberOfClass:[DWRender class]]) | 4653 if([image isMemberOfClass:[DWRender class]]) |
4649 { | 4654 { |
4650 DWRender *render = image; | 4655 DWRender *render = image; |
4691 id image = handle; | 4696 id image = handle; |
4692 UIImage *bi = nil; | 4697 UIImage *bi = nil; |
4693 bool bCanDraw = YES; | 4698 bool bCanDraw = YES; |
4694 | 4699 |
4695 if(pixmap) | 4700 if(pixmap) |
4696 bi = image = (id)pixmap->image; | 4701 bi = (id)pixmap->image; |
4697 else | 4702 else |
4698 { | 4703 { |
4699 if([image isMemberOfClass:[DWRender class]]) | 4704 if([image isMemberOfClass:[DWRender class]]) |
4700 { | 4705 { |
4701 DWRender *render = image; | 4706 DWRender *render = image; |
4746 DWRender *render; | 4751 DWRender *render; |
4747 bool bCanDraw = YES; | 4752 bool bCanDraw = YES; |
4748 | 4753 |
4749 if(pixmap) | 4754 if(pixmap) |
4750 { | 4755 { |
4751 bi = image = (id)pixmap->image; | 4756 bi = (id)pixmap->image; |
4752 font = pixmap->font; | 4757 font = pixmap->font; |
4753 render = pixmap->handle; | 4758 render = pixmap->handle; |
4754 if(!font && [render isMemberOfClass:[DWRender class]]) | 4759 if(!font && [render isMemberOfClass:[DWRender class]]) |
4755 { | 4760 { |
4756 font = [render font]; | 4761 font = [render font]; |
4757 } | 4762 } |
4758 image = (id)pixmap->image; | |
4759 } | 4763 } |
4760 else if(image && [image isMemberOfClass:[DWRender class]]) | 4764 else if(image && [image isMemberOfClass:[DWRender class]]) |
4761 { | 4765 { |
4762 render = image; | 4766 render = image; |
4763 font = [render font]; | 4767 font = [render font]; |
4857 UIImage *bi = nil; | 4861 UIImage *bi = nil; |
4858 bool bCanDraw = YES; | 4862 bool bCanDraw = YES; |
4859 int z; | 4863 int z; |
4860 | 4864 |
4861 if(pixmap) | 4865 if(pixmap) |
4862 bi = image = (id)pixmap->image; | 4866 bi = (id)pixmap->image; |
4863 else | 4867 else |
4864 { | 4868 { |
4865 if([image isMemberOfClass:[DWRender class]]) | 4869 if([image isMemberOfClass:[DWRender class]]) |
4866 { | 4870 { |
4867 DWRender *render = image; | 4871 DWRender *render = image; |
4918 id image = handle; | 4922 id image = handle; |
4919 UIImage *bi = nil; | 4923 UIImage *bi = nil; |
4920 bool bCanDraw = YES; | 4924 bool bCanDraw = YES; |
4921 | 4925 |
4922 if(pixmap) | 4926 if(pixmap) |
4923 bi = image = (id)pixmap->image; | 4927 bi = (id)pixmap->image; |
4924 else | 4928 else |
4925 { | 4929 { |
4926 if([image isMemberOfClass:[DWRender class]]) | 4930 if([image isMemberOfClass:[DWRender class]]) |
4927 { | 4931 { |
4928 DWRender *render = image; | 4932 DWRender *render = image; |
4977 id image = handle; | 4981 id image = handle; |
4978 UIImage *bi = nil; | 4982 UIImage *bi = nil; |
4979 bool bCanDraw = YES; | 4983 bool bCanDraw = YES; |
4980 | 4984 |
4981 if(pixmap) | 4985 if(pixmap) |
4982 bi = image = (id)pixmap->image; | 4986 bi = (id)pixmap->image; |
4983 else | 4987 else |
4984 { | 4988 { |
4985 if([image isMemberOfClass:[DWRender class]]) | 4989 if([image isMemberOfClass:[DWRender class]]) |
4986 { | 4990 { |
4987 DWRender *render = image; | 4991 DWRender *render = image; |
5776 DW_FUNCTION_INIT; | 5780 DW_FUNCTION_INIT; |
5777 DWContainer *cont = handle; | 5781 DWContainer *cont = handle; |
5778 UIScrollView *sv = [cont scrollview]; | 5782 UIScrollView *sv = [cont scrollview]; |
5779 int rowcount = (int)[cont numberOfRowsInSection:0]; | 5783 int rowcount = (int)[cont numberOfRowsInSection:0]; |
5780 CGPoint offset = [sv contentOffset]; | 5784 CGPoint offset = [sv contentOffset]; |
5781 float change; | |
5782 | 5785 |
5783 /* Safety check */ | 5786 /* Safety check */ |
5784 if(rowcount < 1) | 5787 if(rowcount < 1) |
5785 { | 5788 { |
5786 return; | 5789 return; |
5787 } | 5790 } |
5788 | |
5789 change = (float)rows/(float)rowcount; | |
5790 | 5791 |
5791 switch(direction) | 5792 switch(direction) |
5792 { | 5793 { |
5793 case DW_SCROLL_TOP: | 5794 case DW_SCROLL_TOP: |
5794 { | 5795 { |
6197 [split setViewController:vc forColumn:UISplitViewControllerColumnSecondary]; | 6198 [split setViewController:vc forColumn:UISplitViewControllerColumnSecondary]; |
6198 } else { | 6199 } else { |
6199 [split addChildViewController:vc]; | 6200 [split addChildViewController:vc]; |
6200 } | 6201 } |
6201 [tmpbox autorelease]; | 6202 [tmpbox autorelease]; |
6203 [vc autorelease]; | |
6202 #if 0 /* TODO: All iOS splitbars are vertical */ | 6204 #if 0 /* TODO: All iOS splitbars are vertical */ |
6203 [split setVertical:(type == DW_VERT ? YES : NO)]; | 6205 [split setVertical:(type == DW_VERT ? YES : NO)]; |
6204 #endif | 6206 #endif |
6205 /* Set the default percent to 50% split */ | 6207 /* Set the default percent to 50% split */ |
6206 [split setPercent:50.0]; | 6208 [split setPercent:50.0]; |