dwindows: mac/dw.m comparison

comparison mac/dw.m @ 2186:25fc0f438c6d

Mac: Attempt to fix cell clipping/visibility issues by fully enabling autosizing on all cells, and only forcing cell layout changes on combination image/text cells. Also some general code cleanup.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Wed, 14 Oct 2020 23:44:25 +0000
parents	8f9a44279ff0
children	6740154cec68

comparison

equal deleted inserted replaced

-:2a52d9fc2de4
+:25fc0f438c6d
 NSTableCellView *browsercell = [[[NSTableCellView alloc] init] autorelease];
 [browsercell setAutoresizesSubviews:YES];
 if(icon)
 {
 NSImageView *iv = [[[NSImageView alloc] init] autorelease];
-[iv setAutoresizingMask:NSViewHeightSizable];
+[iv setAutoresizingMask:NSViewHeightSizable|(text ? 0 :NSViewWidthSizable)];
 [iv setImage:icon];
 [browsercell setImageView:iv];
 [browsercell addSubview:iv];
 }
 if(text)
 return browsercell;
 }
 void _dw_table_cell_view_layout(NSTableCellView *result)
 {
-int width = 0;
+/* Adjust the frames of the textField and imageView when both are present */
-NSRect rect = result.frame;
+if([result imageView] && [result textField])
+{
+NSImageView *iv = [result imageView];
+NSImage *icon = [iv image];
+NSTextField *tf = [result textField];
+NSRect rect = result.frame;
+int width =[icon size].width;
-/* Adjust the frames of the textField and imageView */
+[iv setFrame:NSMakeRect(0,0,width,rect.size.height)];
-if([result imageView])
-{
-NSImage *icon = [[result imageView] image];
-width = [icon size].width;
-[[result imageView] setFrame:NSMakeRect(0,0,width,rect.size.height)];
-}
-if([result textField])
-{
 /* Adjust the rect to allow space for the image */
-if([result imageView])
+rect.origin.x += width;
-{
+rect.size.width -= width;
-rect.origin.x += width;
+[tf setFrame:rect];
-rect.size.width -= width;
-}
-[[result textField] setFrame:rect];
 }
 }
 #endif
 /* Subclass for a Container/List type */
 [rowView setBackgroundColor:oddcolor];
 }
 }
 -(NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row;
 {
-/* Get an existing cell with the MyView identifier if it exists */
+/* Not reusing cell views, so get the cell from our array */
 int index = (int)(row * [tvcols count]) + (int)[tvcols indexOfObject:tableColumn];
 id celldata = [data objectAtIndex:index];
 /* The data is already a NSTableCellView so just return that */
 if([celldata isMemberOfClass:[NSTableCellView class]])
 * Spinbutton: 50x(maxfontheight)
 * Text/Status: (textwidth)x(textheight)
 * Ranged: 100x14 or 14x100 for vertical.
 * Buttons/Bitmaps: Size of text or image and border.
 */
-void _control_size(id handle, int *width, int *height)
+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);
 tmpitem[index].hsize = hsize ? SIZEEXPAND : SIZESTATIC;
 tmpitem[index].vsize = vsize ? SIZEEXPAND : SIZESTATIC;
 /* If either of the parameters are -1 ... calculate the size */
 if(width == -1 || height == -1)
-_control_size(object, width == -1 ? &tmpitem[index].width : NULL, height == -1 ? &tmpitem[index].height : NULL);
+_dw_control_size(object, width == -1 ? &tmpitem[index].width : NULL, height == -1 ? &tmpitem[index].height : NULL);
 thisbox->items = tmpitem;
 /* Update the item count */
 thisbox->count++;
 void API dw_box_pack_end(HWND box, HWND item, int width, int height, int hsize, int vsize, int pad)
 {
 _dw_box_pack(box, item, 0, width, height, hsize, vsize, pad, "dw_box_pack_end()");
 }
-HWND _button_new(const char *text, ULONG cid)
+/* Internal function to create a basic button, used by all button types */
+HWND _dw_button_new(const char *text, ULONG cid)
 {
 DWButton *button = [[DWButton alloc] init];
 if(text)
 {
 [button setTitle:[ NSString stringWithUTF8String:text ]];
 *       text: The text to be display by the static text widget.
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
 HWND API dw_button_new(const char *text, ULONG cid)
 {
-DWButton *button = _button_new(text, cid);
+DWButton *button = _dw_button_new(text, cid);
 [button setButtonType:DWButtonTypeMomentaryPushIn];
 [button setBezelStyle:DWBezelStyleRounded];
 [button setImagePosition:NSNoImage];
 [button setAlignment:DWTextAlignmentCenter];
 [[button cell] setControlTint:NSBlueControlTint];
 {
 NSBundle *bundle = [NSBundle mainBundle];
 NSString *respath = [bundle resourcePath];
 NSString *filepath = [respath stringByAppendingFormat:@"/%lu.png", resid];
 NSImage *image = [[NSImage alloc] initWithContentsOfFile:filepath];
-DWButton *button = _button_new("", resid);
+DWButton *button = _dw_button_new("", resid);
 if(image)
 {
 [button setImage:image];
 }
 if(text)
 if(!image && ext)
 {
 nstr = [nstr stringByAppendingString: [NSString stringWithUTF8String:ext]];
 image = [[NSImage alloc] initWithContentsOfFile:nstr];
 }
-DWButton *button = _button_new("", cid);
+DWButton *button = _dw_button_new("", cid);
 if(image)
 {
 [button setImage:image];
 }
 if(text)
 */
 HWND API dw_bitmapbutton_new_from_data(const char *text, unsigned long cid, const char *data, int len)
 {
 NSData *thisdata = [NSData dataWithBytes:data length:len];
 NSImage *image = [[NSImage alloc] initWithData:thisdata];
-DWButton *button = _button_new("", cid);
+DWButton *button = _dw_button_new("", cid);
 if(image)
 {
 [button setImage:image];
 }
 if(text)
 *       text: The text to be display by the static text widget.
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
 HWND API dw_radiobutton_new(const char *text, ULONG cid)
 {
-DWButton *button = _button_new(text, cid);
+DWButton *button = _dw_button_new(text, cid);
 [button setButtonType:DWButtonTypeRadio];
 return button;
 }
 /*
 *       text: The text to be display by the static text widget.
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
 HWND API dw_checkbox_new(const char *text, ULONG cid)
 {
-DWButton *button = _button_new(text, cid);
+DWButton *button = _dw_button_new(text, cid);
 [button setButtonType:DWButtonTypeSwitch];
 [button setBezelStyle:DWBezelStyleRegularSquare];
 return button;
 }
 [button setState:DWControlStateValueOff];
 }
 }
-/* Common code for containers and listboxes */
+/* Internal common function to create containers and listboxes */
-HWND _cont_new(ULONG cid, int multi)
+HWND _dw_cont_new(ULONG cid, int multi)
 {
 NSScrollView *scrollview  = [[NSScrollView alloc] init];
 DWContainer *cont = [[DWContainer alloc] init];
 [cont setScrollview:scrollview];
 [scrollview setBorderType:NSBezelBorder];
 [scrollview setHasVerticalScroller:YES];
 [scrollview setAutohidesScrollers:YES];
+[cont setAllowsMultipleSelection:(multi ? YES : NO)];
-if(multi)
+[cont setAllowsColumnReordering:NO];
-{
-[cont setAllowsMultipleSelection:YES];
-}
-else
-{
-[cont setAllowsMultipleSelection:NO];
-}
 [cont setDataSource:cont];
 [cont setDelegate:cont];
 [scrollview setDocumentView:cont];
 [cont setTag:cid];
 [cont autorelease];
 DW_FUNCTION_ADD_PARAM2(cid, multi)
 DW_FUNCTION_RETURN(dw_listbox_new, HWND)
 DW_FUNCTION_RESTORE_PARAM2(cid, ULONG, multi, int)
 {
 DW_FUNCTION_INIT;
-DWContainer *cont = _cont_new(cid, multi);
+DWContainer *cont = _dw_cont_new(cid, multi);
 [cont setHeaderView:nil];
 int type = DW_CFA_STRING;
 [cont setup];
 NSTableColumn *column = [[[NSTableColumn alloc] initWithIdentifier:@"_DWListboxColumn"] autorelease];
 [column setEditable:NO];
 DW_FUNCTION_ADD_PARAM2(cid, multi)
 DW_FUNCTION_RETURN(dw_container_new, HWND)
 DW_FUNCTION_RESTORE_PARAM2(cid, ULONG, multi, int)
 {
 DW_FUNCTION_INIT;
-DWContainer *cont = _cont_new(cid, multi);
+DWContainer *cont = _dw_cont_new(cid, multi);
 NSScrollView *scrollview = [cont scrollview];
 [scrollview setHasHorizontalScroller:YES];
 NSTableHeaderView *header = [[[NSTableHeaderView alloc] init] autorelease];
 [cont setHeaderView:header];
 [cont setTarget:cont];
 Item *item = _box_item(handle);
 /* Check to see if any of the sizes need to be recalculated */
 if(item && (item->origwidth == -1 || item->origheight == -1))
 {
-_control_size(handle, item->origwidth == -1 ? &item->width : NULL, item->origheight == -1 ? &item->height : NULL);
+_dw_control_size(handle, item->origwidth == -1 ? &item->width : NULL, item->origheight == -1 ? &item->height : NULL);
 /* Queue a redraw on the top-level window */
 _dw_redraw([object window], TRUE);
 }
 return DW_ERROR_NONE;
 }
 /* Check to see if any of the sizes need to be recalculated */
 if(item && (item->origwidth == -1 || item->origheight == -1))
 {
 int newwidth, newheight;
-_control_size(handle, &newwidth, &newheight);
+_dw_control_size(handle, &newwidth, &newheight);
 /* Only update the item and redraw the window if it changed */
 if((item->origwidth == -1 && item->width != newwidth) ||
 (item->origheight == -1 && item->height != newheight))
 {
 Item *item = _box_item(handle);
 /* Check to see if any of the sizes need to be recalculated */
 if(item && (item->origwidth == -1 || item->origheight == -1))
 {
-_control_size(handle, item->origwidth == -1 ? &item->width : NULL, item->origheight == -1 ? &item->height : NULL);
+_dw_control_size(handle, item->origwidth == -1 ? &item->width : NULL, item->origheight == -1 ? &item->height : NULL);
 /* Queue a redraw on the top-level window */
 _dw_redraw([object window], TRUE);
 }
 DW_LOCAL_POOL_OUT;
 }
 Item *item = _box_item(handle);
 /* Check to see if any of the sizes need to be recalculated */
 if(item && (item->origwidth == -1 || item->origheight == -1))
 {
-_control_size(handle, item->origwidth == -1 ? &item->width : NULL, item->origheight == -1 ? &item->height : NULL);
+_dw_control_size(handle, item->origwidth == -1 ? &item->width : NULL, item->origheight == -1 ? &item->height : NULL);
 /* Queue a redraw on the top-level window */
 _dw_redraw([object window], TRUE);
 }
 }
 }
 if(width) *width = thisbox->minwidth;
 if(height) *height = thisbox->minheight;
 }
 }
 else
-_control_size(handle, width, height);
+_dw_control_size(handle, width, height);
 }
 /*
 * Sets the gravity of a given window (widget).
 * Gravity controls which corner of the screen and window the position is relative to.

Mercurial > dwindows

comparison mac/dw.m @ 2186:25fc0f438c6d