dwindows: ios/dw.m comparison

comparison ios/dw.m @ 2413:8727ad1a19c3

iOS: Fix notebook relayout on rotation. Also fix autosizing of controls.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Thu, 01 Apr 2021 21:15:55 +0000
parents	3b59cbd26fab
children	5e5fab842901

comparison

equal deleted inserted replaced

-:3b59cbd26fab
+:8727ad1a19c3
 -(UISegmentedControl *)tabs { return tabs; }
 -(NSMutableArray<DWNotebookPage *> *)views { return views; };
 -(void)pageChanged:(id)sender
 {
 NSInteger intpageid = [tabs selectedSegmentIndex];
-DWNotebookPage *page = [[self views] objectAtIndex:intpageid];
+if(intpageid != NSNotFound && intpageid < [views count])
-/* Hide the previously visible page contents */
+{
-if(page != visible)
+DWNotebookPage *page = [views objectAtIndex:intpageid];
-[visible setHidden:YES];
+/* Hide the previously visible page contents */
-/* If the new page is a valid box, lay it out */
+if(page != visible)
-if([page isKindOfClass:[DWBox class]])
+[visible setHidden:YES];
-{
-Box *box = [page box];
+/* If the new page is a valid box, lay it out */
-/* Start with the entire notebook size and then adjust
+if([page isKindOfClass:[DWBox class]])
-* it to account for the segement control's height.
+{
-*/
+Box *box = [page box];
-NSInteger height = [tabs frame].size.height;
+/* Start with the entire notebook size and then adjust
-CGRect frame = [self frame];
+* it to account for the segement control's height.
-frame.origin.y += height;
+*/
-frame.size.height -= height;
+NSInteger height = [tabs frame].size.height;
-[page setFrame:frame];
+CGRect frame = [self frame];
-[page setHidden:NO];
+frame.origin.y += height;
-visible = page;
+frame.size.height -= height;
-_dw_do_resize(box, frame.size.width, frame.size.height);
+[page setFrame:frame];
-_dw_handle_resize_events(box);
+[page setHidden:NO];
-}
+visible = page;
-_dw_event_handler(self, DW_INT_TO_POINTER(intpageid), 15);
+_dw_do_resize(box, frame.size.width, frame.size.height);
+_dw_handle_resize_events(box);
+}
+_dw_event_handler(self, DW_INT_TO_POINTER(intpageid), 15);
+}
 }
 -(void)dealloc {
 UserData *root = userdata;
 _dw_remove_userdata(&root, NULL, TRUE);
 dw_signal_disconnect_by_window(self);
 _dw_event_handler(handle, nil, 1);
 }
 }
 }
 /* Special handling for notebook controls */
-#if 0 /* TODO: Segmented control might not have subviews */
 else if([handle isMemberOfClass:[DWNotebook class]])
 {
-DWNotebook *notebook = (DWNotebook *)handle;
+DWNotebook *notebook = handle;
-NSInteger index = [notebook selectedSegmentIndex];
+NSInteger intpageid = [[notebook tabs] selectedSegmentIndex];
-id view = [notepage view];
+if(intpageid != NSNotFound && intpageid < [[notebook views] count])
-if([view isMemberOfClass:[DWBox class]])
 {
-Box *box = (Box *)[view box];
+DWNotebookPage *page = [[notebook views] objectAtIndex:intpageid];
-_dw_handle_resize_events(box);
+if([page isKindOfClass:[DWBox class]])
+{
+Box *box = [page box];
+_dw_handle_resize_events(box);
+}
 }
 }
-#endif
 /* Handle laying out scrollviews... if required space is less
 * than available space, then expand.  Otherwise use required space.
 */
 else if([handle isMemberOfClass:[DWScrollBox class]])
 {
 /* If the calculated size is valid... */
 if(height > 0 && width > 0)
 {
 int pad = thisbox->items[z].pad;
-UIView *handle = thisbox->items[z].hwnd;
+id handle = thisbox->items[z].hwnd;
 CGRect rect;
 rect.origin.x = currentx + pad;
 rect.origin.y = currenty + pad;
 rect.size.width = width;
 _dw_resize_box(tmp, depth, width, height, pass);
 (*depth)--;
 }
 }
-#if 0 /* TODO: Segemented control may not have subviews */
 /* Special handling for notebook controls */
 if([handle isMemberOfClass:[DWNotebook class]])
 {
-DWNotebook *notebook = (DWNotebook *)handle;
+DWNotebook *notebook = handle;
-NSInteger index = [notebook selectedSegmentIndex];
+NSInteger intpageid = [[notebook tabs] selectedSegmentIndex];
-id view = [notepage view];
+if(intpageid != NSNotFound && intpageid < [[notebook views] count])
-if([view isMemberOfClass:[DWBox class]])
 {
-Box *box = (Box *)[view box];
+DWNotebookPage *page = [[notebook views] objectAtIndex:intpageid];
-CGSize size = [view frame].size;
-_dw_do_resize(box, size.width, size.height);
+/* If the new page is a valid box, lay it out */
-_dw_handle_resize_events(box);
+if([page isKindOfClass:[DWBox class]])
+{
+Box *box = [page box];
+/* Start with the entire notebook size and then adjust
+* it to account for the segement control's height.
+*/
+NSInteger height = [[notebook tabs] frame].size.height;
+CGRect frame = [notebook frame];
+frame.origin.y += height;
+frame.size.height -= height;
+[page setFrame:frame];
+_dw_do_resize(box, frame.size.width, frame.size.height);
+_dw_handle_resize_events(box);
+}
 }
 }
-#endif
 /* Handle laying out scrollviews... if required space is less
 * than available space, then expand.  Otherwise use required space.
 */
 else if([handle isMemberOfClass:[DWScrollBox class]])
 {
 thisheight = (int)size.height;
 }
 else
 {
 /* Text button */
-nsstr = [object title];
+nsstr = [[object titleLabel] text];
 extrawidth = 8;
 extraheight = 4;
 }
 break;
 thiswidth = 50;
 else
 thiswidth = 150;
 }
 else
-nsstr = [object stringValue];
+nsstr = [object text];
 if(font)
 thisheight = (int)[font lineHeight];
 }
 /* Handle the ranged widgets */
 if(thisheight < _DW_SCROLLED_MIN_HEIGHT)
 thisheight = _DW_SCROLLED_MIN_HEIGHT;
 if(thisheight > _DW_SCROLLED_MAX_HEIGHT)
 thisheight = _DW_SCROLLED_MAX_HEIGHT;
 }
+else if([ object isMemberOfClass:[UILabel class] ])
+nsstr = [object text];
 /* Any other control type */
 else if([ object isKindOfClass:[ UIControl class ] ])
-nsstr = [object stringValue];
+nsstr = [object text];
 /* If we have a string...
 * calculate the size with the current font.
 */
 if(nsstr && [nsstr length])
 DW_FUNCTION_RETURN(dw_notebook_page_get, unsigned long)
 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
 {
 DWNotebook *notebook = handle;
 NSInteger index = [[notebook tabs] selectedSegmentIndex];
-NSMutableArray<DWNotebookPage *> *views = [notebook views];
+unsigned long retval = 0;
-DWNotebookPage *notepage = [views objectAtIndex:index];
-unsigned long retval = [notepage pageid];
+if(index != NSNotFound)
+{
+NSMutableArray<DWNotebookPage *> *views = [notebook views];
+DWNotebookPage *notepage = [views objectAtIndex:index];
+retval = [notepage pageid];
+}
 DW_FUNCTION_RETURN_THIS(retval);
 }
 /*
 * Sets the currently visibale page ID.

Mercurial > dwindows

comparison ios/dw.m @ 2413:8727ad1a19c3