dwindows: ios/dw.m comparison

comparison ios/dw.m @ 2416:353581ebf4a5

iOS: Fix display of widgets. DWMLE and DWContainer are subclasses of UIScrollView. On MacOS we had to place them inside a NSScrollView, which is unnecessary on iOS, thus the scrollView method was returning nil preventing packing of those type widgets. Also fix UIScrollViewCell text and image creation.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Sat, 03 Apr 2021 00:14:05 +0000
parents	f33a81fa29e9
children	ccfc4ee9c4a7

comparison

equal deleted inserted replaced

-:f33a81fa29e9
+:353581ebf4a5
 {
 char *file = alloca(strlen(filename) + 6);
 int found_ext = 0,i;
 /* Try various extentions */
-for ( i = 0; i < NUM_EXTS; i++ )
+for(i = 0; i < NUM_EXTS; i++)
 {
-strcpy( file, filename );
+strcpy(file, filename);
-strcat( file, _dw_image_exts[i] );
+strcat(file, _dw_image_exts[i]);
-if ( access( file, R_OK ) == 0 )
+if(access(file, R_OK ) == 0)
 {
 found_ext = 1;
 break;
 }
 }
-if ( found_ext == 1 )
+if(found_ext == 1)
 {
 return _dw_image_exts[i];
 }
 return NULL;
 }
 typedef struct
 {
 ULONG message;
 char name[30];
-} SignalList;
+} DWSignalList;
 /* List of signals */
 #define SIGNALMAX 19
-static SignalList DWSignalTranslate[SIGNALMAX] = {
+static DWSignalList DWSignalTranslate[SIGNALMAX] = {
 { 1,    DW_SIGNAL_CONFIGURE },
 { 2,    DW_SIGNAL_KEY_PRESS },
 { 3,    DW_SIGNAL_BUTTON_PRESS },
 { 4,    DW_SIGNAL_BUTTON_RELEASE },
 { 5,    DW_SIGNAL_MOTION_NOTIFY },
 static NSMutableArray *_DWDirtyDrawables;
 static DWTID DWThread = (DWTID)-1;
 static HEV DWMainEvent;
 /* Used for doing bitblts from the main thread */
-typedef struct _bitbltinfo
+typedef struct _dw_bitbltinfo
 {
 id src;
 id dest;
 int xdest;
 int ydest;
 /* Unhide our hidden window and make it key */
 [hiddenWindow setHidden:NO];
 [hiddenWindow makeKeyAndVisible];
 [delegate setDialog:dialog];
 [picker setDelegate:delegate];
-/* Wait for them to pick a color */
+/* Wait for them to pick a font */
 [[hiddenWindow rootViewController] presentViewController:picker animated:YES completion:nil];
 font = dw_dialog_wait(dialog);
 /* Once the dialog is gone we can rehide our window */
 [hiddenWindow resignKeyWindow];
 [hiddenWindow setHidden:YES];
 /* Unhide our hidden window and make it key */
 [hiddenWindow setHidden:NO];
 [hiddenWindow makeKeyAndVisible];
 [delegate setDialog:dialog];
 [picker setDelegate:delegate];
-/* Wait for them to pick a color */
+/* Wait for them to pick a file */
 [[hiddenWindow rootViewController] presentViewController:picker animated:YES completion:nil];
 file = dw_dialog_wait(dialog);
 /* Once the dialog is gone we can rehide our window */
 [hiddenWindow resignKeyWindow];
 [hiddenWindow setHidden:YES];
 /* Subclass for a MLE type */
 @interface DWMLE : UITextView
 {
 void *userdata;
-id scrollview;
 }
 -(void *)userdata;
 -(void)setUserdata:(void *)input;
--(id)scrollview;
--(void)setScrollview:(id)input;
 @end
 @implementation DWMLE
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
--(id)scrollview { return scrollview; }
--(void)setScrollview:(id)input { scrollview = input; }
 -(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
 /* TODO: UITableView does not support variable columns...
 * also OutlineView does not exist in iOS.
 {
 UITableViewCell *browsercell = [[[UITableViewCell alloc] init] autorelease];
 [browsercell setAutoresizesSubviews:YES];
 if(icon)
-{
+[[browsercell imageView] setImage:icon];
-if(@available(iOS 14.0, *))
-{
-UIListContentConfiguration *content = [browsercell defaultContentConfiguration];
-[content setImage:icon];
-}
-else
-{
-[browsercell setImage:icon];
-}
-}
 if(text)
-{
+[[browsercell textLabel] setText:text];
-if(@available(iOS 14.0, *))
-{
-UIListContentConfiguration *content = [browsercell defaultContentConfiguration];
-[content setText:text];
-}
-else
-{
-[browsercell setText:text];
-}
-}
 return browsercell;
 }
 /* Subclass for a Container/List type */
 @interface DWContainer : UITableView <UITableViewDataSource,UITableViewDelegate>
 NSPointerArray *rowdatas;
 UIColor *fgcolor, *oddcolor, *evencolor;
 unsigned long dw_oddcolor, dw_evencolor;
 unsigned long _DW_COLOR_ROW_ODD, _DW_COLOR_ROW_EVEN;
 int iLastAddPoint, iLastQueryPoint;
-id scrollview;
 int filesystem;
 }
 -(NSInteger)tableView:(UITableView *)aTable numberOfRowsInSection:(NSInteger)section;
 -(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath;
 -(void)tableView:(UITableView*)tableView willDisplayCell:(UITableViewCell*)cell forRowAtIndexPath:(NSIndexPath*)indexPath;
 -(NSString *)getColumn:(int)col;
 -(void *)userdata;
 -(void)setUserdata:(void *)input;
 -(void)setFilesystem:(int)input;
 -(int)filesystem;
--(id)scrollview;
--(void)setScrollview:(id)input;
 -(int)addRow:(NSArray *)input;
 -(int)addRows:(int)number;
 -(void)editCell:(id)input at:(int)row and:(int)col;
 -(void)removeRow:(int)row;
 -(void)setRow:(int)row title:(const char *)input;
 if(tvcols && data)
 {
 int cols = (int)[tvcols count];
 int total = (int)[data count];
 if(cols && total)
-{
 return total / cols;
-}
 }
 return 0;
 }
 -(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
 UITableViewCell *result = celldata;
 /* Copy the alignment setting from the column,
 * and set the text color from the container.
 */
-if(@available(iOS 14.0, *))
+if(fgcolor)
-{
+[[result textLabel] setTextColor:fgcolor];
-UIListContentConfiguration *content = [result defaultContentConfiguration];
-if(fgcolor)
-[[content textProperties] setColor:fgcolor];
-}
-else
-{
-if(fgcolor)
-[result setTextColor:fgcolor];
-}
 /* Return the result */
 return result;
 }
 return nil;
 }
 -(NSString *)getColumn:(int)col { if(tvcols) { return [tvcols objectAtIndex:col]; } return nil; }
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
 -(void)setFilesystem:(int)input { filesystem = input; }
 -(int)filesystem { return filesystem; }
--(id)scrollview { return scrollview; }
--(void)setScrollview:(id)input { scrollview = input; }
 -(void)refreshColors
 {
 UIColor *oldodd = oddcolor;
 UIColor *oldeven = evencolor;
 unsigned long thisodd = dw_oddcolor == DW_CLR_DEFAULT ? _DW_COLOR_ROW_ODD : dw_oddcolor;
 }
 return range;
 }
 /* Return the handle to the text object */
-id _text_handle(id object)
+id _dw_text_handle(id object)
 {
 if([object isMemberOfClass:[ DWSpinButton class]])
 {
 DWSpinButton *spinbutton = object;
 object = [spinbutton textfield];
 */
 void _dw_control_size(id handle, int *width, int *height)
 {
 int thiswidth = 1, thisheight = 1, extrawidth = 0, extraheight = 0;
 NSString *nsstr = nil;
-id object = _text_handle(handle);
+id object = _dw_text_handle(handle);
 /* Handle all the different button types */
 if([ object isKindOfClass:[ UIButton class ] ])
 {
 switch([object buttonType])
 [ object isMemberOfClass:[DWContainer class] ])
 {
 CGSize size;
 if([ object isMemberOfClass:[DWMLE class] ])
-{
+size = [object contentSize];
-UIScrollView *sv = [object scrollview];
-CGRect frame = [sv frame];
-/* Size the text view to fit */
-[object sizeToFit];
-frame.size = [object bounds].size;
-frame.size.width += 2.0;
-frame.size.height += 2.0;
-[sv setFrame:frame];
-size = frame.size;
-}
 else
 size = [object getsize];
 thiswidth = size.width;
 thisheight = size.height;
 thisbox = [view box];
 thisitem = thisbox->items;
 object = item;
-/* Query the objects */
-if([ object isMemberOfClass:[ DWContainer class ] ] ||
-[ object isMemberOfClass:[ DWMLE class ] ])
-{
-this = item = [object scrollview];
-}
 /* Do some sanity bounds checking */
 if(!thisitem)
 thisbox->count = 0;
 if(index < 0)
 index = 0;
 /* Fill in the item data appropriately */
 if([object isKindOfClass:[DWBox class]])
 tmpitem[index].type = TYPEBOX;
 else
 {
-if ( width == 0 && hsize == FALSE )
+if(width == 0 && hsize == FALSE)
 dw_messagebox(funcname, DW_MB_OK|DW_MB_ERROR, "Width and expand Horizonal both unset for box: %x item: %x",box,item);
-if ( height == 0 && vsize == FALSE )
+if(height == 0 && vsize == FALSE)
 dw_messagebox(funcname, DW_MB_OK|DW_MB_ERROR, "Height and expand Vertical both unset for box: %x item: %x",box,item);
 tmpitem[index].type = TYPEITEM;
 }
 int retval = DW_ERROR_NONE;
 if([object isKindOfClass:[UIView class]] || [object isKindOfClass:[UIControl class]])
 {
 DWBox *parent = (DWBox *)[object superview];
-/* Some controls are embedded in scrollviews...
-* so get the parent of the scrollview in that case.
-*/
-if(([object isKindOfClass:[UITableView class]] || [object isMemberOfClass:[DWMLE class]]))
-{
-object = [parent superview];
-parent = (DWBox *)[object superview];
-}
 if([parent isKindOfClass:[DWBox class]])
 {
 id window = [object window];
 Box *thisbox = [parent box];
 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] retain];
-UIScrollView *scrollview  = [[UIScrollView alloc] init];
 CGSize size = [mle intrinsicContentSize];
 size.width = size.height;
 [mle setAutoresizingMask:UIViewAutoresizingFlexibleHeight|UIViewAutoresizingFlexibleWidth];
-[mle setScrollview:scrollview];
 [mle setTag:cid];
 [mle autorelease];
 DW_FUNCTION_RETURN_THIS(mle);
 }
 DW_FUNCTION_NO_RETURN(dw_container_scroll)
 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, direction, int, DW_UNUSED(rows), long)
 {
 DW_FUNCTION_INIT;
 DWContainer *cont = handle;
-UIScrollView *sv = [cont scrollview];
 int rowcount = (int)[cont numberOfRowsInSection:0];
-CGPoint offset = [sv contentOffset];
+CGPoint offset = [cont contentOffset];
 /* Safety check */
 if(rowcount < 1)
 {
 return;
 offset.y = 0;
 break;
 }
 case DW_SCROLL_BOTTOM:
 {
-offset.y = [sv contentSize].height - [sv visibleSize].height;
+offset.y = [cont contentSize].height - [cont visibleSize].height;
 break;
 }
 /* TODO: Currently scrolling a full page, need to use row parameter instead */
 case DW_SCROLL_UP:
 {
-offset.y -= [sv visibleSize].height;
+offset.y -= [cont visibleSize].height;
 break;
 }
 case DW_SCROLL_DOWN:
 {
-offset.y += [sv visibleSize].height;
+offset.y += [cont visibleSize].height;
 break;
 }
 }
 if(offset.y < 0)
 offset.y = 0;
-[sv setContentOffset:offset];
+[cont setContentOffset:offset];
 DW_FUNCTION_RETURN_NOTHING;
 }
 /*
 * Starts a new query of a container.
 DW_FUNCTION_DEFINITION(dw_window_set_style, void, HWND handle, ULONG style, ULONG mask)
 DW_FUNCTION_ADD_PARAM3(handle, style, mask)
 DW_FUNCTION_NO_RETURN(dw_window_set_style)
 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, style, ULONG, mask, ULONG)
 {
-id object = _text_handle(handle);
+id object = _dw_text_handle(handle);
 if([object isKindOfClass:[UILabel class]])
 {
 UILabel *label = object;
 {
 /* Find the item within the box it is packed into */
 if([object isKindOfClass:[DWBox class]] || [object isKindOfClass:[UIControl class]])
 {
 DWBox *parent = (DWBox *)[object superview];
-/* Some controls are embedded in scrollviews...
-* so get the parent of the scrollview in that case.
-*/
-if([object isKindOfClass:[UITableView class]])
-{
-object = [parent superview];
-parent = (DWBox *)[object superview];
-}
 if([parent isKindOfClass:[DWBox class]])
 {
 Box *thisbox = [parent box];
 Item *thisitem = thisbox->items;
 UIFont *font = fontname ? _dw_font_by_name(fontname) :
 (DWDefaultFont ? DWDefaultFont : [UIFont systemFontOfSize:[UIFont smallSystemFontSize]]);
 if(font)
 {
-id object = _text_handle(handle);
+id object = _dw_text_handle(handle);
 if([object isMemberOfClass:[DWMLE class]])
 {
 DWMLE *mle = object;
 [mle setFont:font];
 * Parameters:
 *           handle: The window handle from which to obtain the font.
 */
 char * API dw_window_get_font(HWND handle)
 {
-id object = _text_handle(handle);
+id object = _dw_text_handle(handle);
 UIFont *font = nil;
 if([object isKindOfClass:[UIControl class]] || [object isMemberOfClass:[DWRender class]])
 {
 font = [object font];
 #endif
 /* Handle destroying a control or box */
 else if([object isKindOfClass:[UIView class]] || [object isKindOfClass:[UIControl class]])
 {
 DWBox *parent = (DWBox *)[object superview];
-/* Some controls are embedded in scrollviews...
-* so get the parent of the scrollview in that case.
-*/
-if(([object isKindOfClass:[UITableView class]] || [object isMemberOfClass:[DWMLE class]]))
-{
-object = [parent superview];
-parent = (DWBox *)[object superview];
-}
 if([parent isKindOfClass:[DWBox class]])
 {
 id window = [object window];
 Box *thisbox = [parent box];
 DW_FUNCTION_ADD_PARAM1(handle)
 DW_FUNCTION_RETURN(dw_window_get_text, char *)
 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
 {
 DW_FUNCTION_INIT;
-id object = _text_handle(handle);
+id object = _dw_text_handle(handle);
 char *retval = NULL;
 if([ object isKindOfClass:[ UIWindow class ] ] || [ object isKindOfClass:[ UIButton class ] ])
 {
 id window = object;
 DW_FUNCTION_ADD_PARAM2(handle, text)
 DW_FUNCTION_NO_RETURN(dw_window_set_text)
 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, text, char *)
 {
 DW_FUNCTION_INIT;
-id object = _text_handle(handle);
+id object = _dw_text_handle(handle);
 if([ object isKindOfClass:[ UIWindow class ] ] || [ object isKindOfClass:[ UIButton class ] ])
 [object setTitle:[NSString stringWithUTF8String:text]];
 else if([ object isKindOfClass:[ UIControl class ] ])
 {

Mercurial > dwindows

comparison ios/dw.m @ 2416:353581ebf4a5