dwindows: ios/dw.m comparison

comparison ios/dw.m @ 2405:38c17a19e00d

iOS: Add adjustment for the statusbar so it isn't covered up by our windows. Also retain all UI objects we create so they don't get disposed off... during our jumps between threads. This may require a release in box packing.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Sun, 28 Mar 2021 18:23:57 +0000
parents	d4a044d24529
children	6336244aa895

comparison

equal deleted inserted replaced

-:d4a044d24529
+:38c17a19e00d
 -(void)viewWillLayoutSubviews
 {
 DWWindow *window = (DWWindow *)[[self view] window];
 NSArray *array = [window subviews];
 DWView *view = [array firstObject];
+CGRect frame = [window frame];
 /* Hide the UITransitionView which is blocking the screen...
 * This is probably not the correct solution, but it solves the
 * problem for the moment.  Figure out what to do with this view.
 */
 id object = [array lastObject];
 if(![object isMemberOfClass:[DWView class]])
 [object setHidden:YES];
-[view setFrame:[window frame]];
+/* Adjust the frame to account for the status bar */
-[view windowResized:[window frame].size];
+frame.size.height -= [UIApplication sharedApplication].statusBarFrame.size.height;;
+[view setFrame:frame];
+[view windowResized:frame.size];
 }
 @end
 /* Subclass for a button type */
 @interface DWButton : UIButton
 DW_FUNCTION_ADD_PARAM2(type, pad)
 DW_FUNCTION_RETURN(dw_box_new, HWND)
 DW_FUNCTION_RESTORE_PARAM2(type, int, pad, int)
 {
 DW_FUNCTION_INIT;
-DWBox *view = [[DWBox alloc] init];
+DWBox *view = [[[DWBox alloc] init] retain];
 Box *newbox = [view box];
 [view setTranslatesAutoresizingMaskIntoConstraints:NO];
 memset(newbox, 0, sizeof(Box));
 newbox->pad = pad;
 newbox->type = type;
 DW_FUNCTION_DEFINITION(dw_scrollbox_new, HWND, int type, int pad)
 DW_FUNCTION_ADD_PARAM2(type, pad)
 DW_FUNCTION_RETURN(dw_scrollbox_new, HWND)
 DW_FUNCTION_RESTORE_PARAM2(type, int, pad, int)
 {
-DWScrollBox *scrollbox = [[DWScrollBox alloc] init];
+DWScrollBox *scrollbox = [[[DWScrollBox alloc] init] retain];
 DWBox *box = dw_box_new(type, pad);
 DWBox *tmpbox = dw_box_new(DW_VERT, 0);
 dw_box_pack_start(tmpbox, box, 1, 1, TRUE, TRUE, 0);
 [scrollbox setBox:box];
 [scrollbox addSubview:tmpbox];
 DW_FUNCTION_DEFINITION(dw_entryfield_new, HWND, const char *text, ULONG cid)
 DW_FUNCTION_ADD_PARAM2(text, cid)
 DW_FUNCTION_RETURN(dw_entryfield_new, HWND)
 DW_FUNCTION_RESTORE_PARAM2(text, const char *, cid, ULONG)
 {
-DWEntryField *entry = [[DWEntryField alloc] init];
+DWEntryField *entry = [[[DWEntryField alloc] init] retain];
 [entry setText:[ NSString stringWithUTF8String:text ]];
 [entry setTag:cid];
 DW_FUNCTION_RETURN_THIS(entry);
 }
 DW_FUNCTION_DEFINITION(dw_spinbutton_new, HWND, const char *text, ULONG cid)
 DW_FUNCTION_ADD_PARAM2(text, cid)
 DW_FUNCTION_RETURN(dw_spinbutton_new, HWND)
 DW_FUNCTION_RESTORE_PARAM2(text, const char *, cid, ULONG)
 {
-DWSpinButton *spinbutton = [[DWSpinButton alloc] init];
+DWSpinButton *spinbutton = [[[DWSpinButton alloc] init] retain];
 UIStepper *stepper = [spinbutton stepper];
 UITextField *textfield = [spinbutton textfield];
 long val = atol(text);
 [stepper setStepValue:1];
 DW_FUNCTION_DEFINITION(dw_slider_new, HWND, int vertical, int increments, ULONG cid)
 DW_FUNCTION_ADD_PARAM3(vertical, increments, cid)
 DW_FUNCTION_RETURN(dw_slider_new, HWND)
 DW_FUNCTION_RESTORE_PARAM3(vertical, int, increments, int, cid, ULONG)
 {
-DWSlider *slider = [[DWSlider alloc] init];
+DWSlider *slider = [[[DWSlider alloc] init] retain];
 [slider setMaximumValue:(double)increments];
 [slider setMinimumValue:0];
 [slider setContinuous:YES];
 [slider addTarget:slider
 action:@selector(sliderChanged:)
 DW_FUNCTION_DEFINITION(dw_percent_new, HWND, ULONG cid)
 DW_FUNCTION_ADD_PARAM1(cid)
 DW_FUNCTION_RETURN(dw_percent_new, HWND)
 DW_FUNCTION_RESTORE_PARAM1(cid, ULONG)
 {
-DWPercent *percent = [[DWPercent alloc] init];
+DWPercent *percent = [[[DWPercent alloc] init] retain];
 [percent setTag:cid];
 DW_FUNCTION_RETURN_THIS(percent);
 }
 /*
 DW_FUNCTION_RETURN(dw_mle_new, HWND)
 DW_FUNCTION_RESTORE_PARAM1(cid, ULONG)
 {
 CGRect frame = CGRectMake(0, 0, 100, 50);
 NSTextContainer *tc = [[NSTextContainer alloc] initWithSize:frame.size];
-DWMLE *mle = [[DWMLE alloc] initWithFrame:frame textContainer:tc];
+DWMLE *mle = [[[DWMLE alloc] initWithFrame:frame textContainer:tc] retain];
 UIScrollView *scrollview  = [[UIScrollView alloc] init];
 CGSize size = [mle intrinsicContentSize];
 size.width = size.height;
 [mle setAutoresizingMask:UIViewAutoresizingFlexibleHeight|UIViewAutoresizingFlexibleWidth];
 DW_FUNCTION_DEFINITION(dw_text_new, HWND, const char *text, ULONG cid)
 DW_FUNCTION_ADD_PARAM2(text, cid)
 DW_FUNCTION_RETURN(dw_text_new, HWND)
 DW_FUNCTION_RESTORE_PARAM2(text, const char *, cid, ULONG)
 {
-DWText *textfield = [[DWText alloc] init];
+DWText *textfield = [[[DWText alloc] init] retain];
 [textfield setText:[NSString stringWithUTF8String:text]];
 [textfield setTag:cid];
 if(DWDefaultFont)
 {
 [textfield setFont:DWDefaultFont];
 DW_FUNCTION_DEFINITION(dw_render_new, HWND, ULONG cid)
 DW_FUNCTION_ADD_PARAM1(cid)
 DW_FUNCTION_RETURN(dw_render_new, HWND)
 DW_FUNCTION_RESTORE_PARAM1(cid, ULONG)
 {
-DWRender *render = [[DWRender alloc] init];
+DWRender *render = [[[DWRender alloc] init] retain];
 [render setTag:cid];
 DW_FUNCTION_RETURN_THIS(render);
 }
 /*
 /* There isn't anything like quite like MDI on MacOS...
 * However we will make floating windows that hide
 * when the application is deactivated to simulate
 * similar behavior.
 */
-DWMDI *mdi = [[DWMDI alloc] init];
+DWMDI *mdi = [[[DWMDI alloc] init] retain];
 /* [mdi setTag:cid]; Why doesn't this work? */
 return mdi;
 }
 /*
 DW_FUNCTION_RESTORE_PARAM4(DW_UNUSED(type), int, topleft, HWND, bottomright, HWND, cid, unsigned long)
 {
 DW_FUNCTION_INIT;
 id tmpbox = dw_box_new(DW_VERT, 0);
 DWSplitBar *split = [[DWSplitBar alloc] init];
-UIViewController *vc = [[UIViewController alloc] init];
+UIViewController *vc = [[[UIViewController alloc] init] retain];
 [split setDelegate:split];
 dw_box_pack_start(tmpbox, topleft, 0, 0, TRUE, TRUE, 0);
 [vc setView:tmpbox];
 if (@available(iOS 14.0, *)) {
 [split setViewController:vc forColumn:UISplitViewControllerColumnPrimary];
 DW_FUNCTION_ADD_PARAM1(cid)
 DW_FUNCTION_RETURN(dw_bitmap_new, HWND)
 DW_FUNCTION_RESTORE_PARAM1(cid, ULONG)
 {
 DW_FUNCTION_INIT;
-UIImageView *bitmap = [[UIImageView alloc] init];
+UIImageView *bitmap = [[[UIImageView alloc] init] retain];
 [bitmap setTag:cid];
 DW_FUNCTION_RETURN_THIS(bitmap);
 }
 /*
 DW_FUNCTION_DEFINITION(dw_calendar_new, HWND, ULONG cid)
 DW_FUNCTION_ADD_PARAM1(cid)
 DW_FUNCTION_RETURN(dw_calendar_new, HWND)
 DW_FUNCTION_RESTORE_PARAM1(cid, ULONG)
 {
-DWCalendar *calendar = [[DWCalendar alloc] init];
+DWCalendar *calendar = [[[DWCalendar alloc] init] retain];
 [calendar setDatePickerMode:UIDatePickerModeDate];
 [calendar setTag:cid];
 [calendar setDate:[NSDate date]];
 DW_FUNCTION_RETURN_THIS(calendar);
 }
 DW_FUNCTION_ADD_PARAM1(cid)
 DW_FUNCTION_RETURN(dw_html_new, HWND)
 DW_FUNCTION_RESTORE_PARAM1(DW_UNUSED(cid), ULONG)
 {
 DW_FUNCTION_INIT;
-DWWebView *web = [[DWWebView alloc] init];
+DWWebView *web = [[[DWWebView alloc] init] retain];
 web.navigationDelegate = web;
 /* [web setTag:cid]; Why doesn't this work? */
 DW_FUNCTION_RETURN_THIS(web);
 }
 *       id: An ID to be used for getting the resource from the
 *           resource file.
 */
 HMENUI API dw_menu_new(ULONG cid)
 {
-DWMenu *menu = [[DWMenu alloc] init];
+DWMenu *menu = [[[DWMenu alloc] init] retain];
 /* [menu setTag:cid]; Why doesn't this work? */
 return menu;
 }
 /*
 DW_FUNCTION_DEFINITION(dw_notebook_new, HWND, ULONG cid, int top)
 DW_FUNCTION_ADD_PARAM2(cid, top)
 DW_FUNCTION_RETURN(dw_notebook_new, HWND)
 DW_FUNCTION_RESTORE_PARAM2(cid, ULONG, top, int)
 {
-DWNotebook *notebook = [[DWNotebook alloc] init];
+DWNotebook *notebook = [[[DWNotebook alloc] init] retain];
 [notebook addTarget:notebook
 action:@selector(pageChanged:)
 forControlEvents:UIControlEventValueChanged];
 [notebook setTag:cid];
 DW_FUNCTION_RETURN_THIS(notebook);

Mercurial > dwindows

comparison ios/dw.m @ 2405:38c17a19e00d