dwindows: mac/dw.m comparison

comparison mac/dw.m @ 2179:bd6146d4bdbc

Mac: Enable autoresizing on the NSTableCellViews and code cleanup.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Tue, 13 Oct 2020 01:51:40 +0000
parents	2fa38504803e
children	bfc089ab053b

comparison

equal deleted inserted replaced

-:2fa38504803e
+:bd6146d4bdbc
 {
 NSScanner *objScanner = [NSScanner scannerWithString:usernotification.identifier];
 unsigned long long handle;
 HWND notification;
-// Skip the dw-notification- prefix
+/* Skip the dw-notification- prefix */
 [objScanner scanString:@"dw-notification-" intoString:nil];
 [objScanner scanUnsignedLongLong:&handle];
 notification = DW_UINT_TO_POINTER(handle);
 switch(usernotification.activationType)
 return cellSize;
 }
 @end
 #endif
-#define _DW_CONTAINER_ICON_WIDTH 16
-#define _DW_CONTAINER_ICON_HEIGHT 16
-#define _DW_CONTAINER_ROW_HEIGHT 20
 #ifdef BUILDING_FOR_YOSEMITE
 NSTableCellView *_dw_table_cell_view_new(NSImage *icon, NSString *text)
 {
-id browsercell = [[[NSTableCellView alloc] init] autorelease];
+NSTableCellView *browsercell = [[[NSTableCellView alloc] init] autorelease];
+[browsercell setAutoresizesSubviews:YES];
 if(icon)
 {
 NSImageView *iv = [[[NSImageView alloc] init] autorelease];
+[iv setAutoresizingMask:NSViewHeightSizable];
+[iv setImage:icon];
 [browsercell setImageView:iv];
 [browsercell addSubview:iv];
-[iv setImage:icon];
 }
 if(text)
 {
 NSTextField *tf = [[[NSTextField alloc] init] autorelease];
-[browsercell setTextField:tf];
+[tf setAutoresizingMask:NSViewHeightSizable|NSViewWidthSizable];
-[browsercell addSubview:tf];
 [tf setStringValue:text];
 [tf setEditable:NO];
 [tf setBezeled:NO];
 [tf setBordered:NO];
+[tf setDrawsBackground:NO];
+[browsercell setTextField:tf];
+[browsercell addSubview:tf];
 }
 return browsercell;
 }
 void _dw_table_cell_view_layout(NSTableCellView *result)
 {
+int width = 0;
+NSRect rect = result.frame;
 /* Adjust the frames of the textField and imageView */
 if([result imageView])
 {
-NSRect rect = NSMakeRect((_DW_CONTAINER_ROW_HEIGHT - _DW_CONTAINER_ICON_WIDTH) / 2,
+NSImage *icon = [[result imageView] image];
-(_DW_CONTAINER_ROW_HEIGHT - _DW_CONTAINER_ICON_HEIGHT) / 2,
+width = [icon size].width;
-_DW_CONTAINER_ICON_WIDTH,_DW_CONTAINER_ICON_HEIGHT);
+[[result imageView] setFrame:NSMakeRect(0,0,width,rect.size.height)];
-[[result imageView] setFrame:rect];
 }
 if([result textField])
 {
-NSRect rect = result.frame;
 /* Adjust the rect to allow space for the image */
 if([result imageView])
 {
-rect.origin.x += _DW_CONTAINER_ICON_WIDTH;
+rect.origin.x += width;
-rect.size.width -= _DW_CONTAINER_ICON_WIDTH;
+rect.size.width -= width;
 }
 [[result textField] setFrame:rect];
 }
 }
 #endif
 /* There is no existing cell to reuse so create a new one */
 if(result == nil)
 {
 /* The data is already a NSTableCellView so just return that */
 if([celldata isMemberOfClass:[NSTableCellView class]])
-{
 result = celldata;
-[result setFrame:NSMakeRect(0,0,tableColumn.width,_DW_CONTAINER_ROW_HEIGHT)];
-[[result textField] setFrame:result.frame];
-}
 else
 {
 /* Create the new NSTableCellView with a frame of the {0,0} with the width of the table.
 * Note that the height of the frame is not really relevant, because the row height will modify the height.
 */
-result = [[NSTableCellView alloc] initWithFrame:NSMakeRect(0,0,tableColumn.width,_DW_CONTAINER_ROW_HEIGHT)];
+result = [[NSTableCellView alloc] init];
 /* The identifier of the NSTextField instance is set to MyView.
 * This allows the cell to be reused.
 */
 [result setIdentifier:tableColumn.identifier];
 }
 }
 _dw_table_cell_view_layout(result);
-/*NSLog(@"viewForTableColumn:%@ row:%d textField:%@ celldata class:%@\n", tableColumn.identifier, (int)row, [[result textField] stringValue], [celldata className]);*/
 tcell = [[result textField] cell];
 /* Handle drawing alternating row colors if enabled */
 if ((row % 2) == 0)
 {
 [[view imageView] setImage:icon];
 }
 else
 view = _dw_table_cell_view_new(icon, text);
 }
-[view setFrame:NSMakeRect(0,0,tableColumn.width,_DW_CONTAINER_ROW_HEIGHT)];
-[[view textField] setFrame:view.frame];
 _dw_table_cell_view_layout(view);
 return view;
 }
 #else
 -(id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item
 API_AVAILABLE(macos(10.14))
 @interface DWUserNotificationCenterDelegate : NSObject <UNUserNotificationCenterDelegate>
 @end
 @implementation DWUserNotificationCenterDelegate
-//Called when a notification is delivered to a foreground app.
+/* Called when a notification is delivered to a foreground app. */
 -(void)userNotificationCenter:(UNUserNotificationCenter *)center willPresentNotification:(UNNotification *)notification withCompletionHandler:(void (^)(UNNotificationPresentationOptions options))completionHandler API_AVAILABLE(macos(10.14))
 {
 completionHandler(UNAuthorizationOptionSound | UNAuthorizationOptionAlert | UNAuthorizationOptionBadge);
 }
-//Called to let your app know which action was selected by the user for a given notification.
+/* Called to let your app know which action was selected by the user for a given notification. */
 -(void)userNotificationCenter:(UNUserNotificationCenter *)center didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(void(^)(void))completionHandler API_AVAILABLE(macos(10.14))
 {
 NSScanner *objScanner = [NSScanner scannerWithString:response.notification.request.identifier];
 unsigned long long handle;
 HWND notification;
-// Skip the dw-notification- prefix
+/* Skip the dw-notification- prefix */
 [objScanner scanString:@"dw-notification-" intoString:nil];
 [objScanner scanUnsignedLongLong:&handle];
 notification = DW_UINT_TO_POINTER(handle);
 if ([response.actionIdentifier isEqualToString:UNNotificationDismissActionIdentifier])
 {
-// The user dismissed the notification without taking action.
+/* The user dismissed the notification without taking action. */
 dw_signal_disconnect_by_window(notification);
 }
 else if ([response.actionIdentifier isEqualToString:UNNotificationDefaultActionIdentifier])
 {
-// The user launched the app.
+/* The user launched the app. */
 _event_handler(notification, nil, 8);
 dw_signal_disconnect_by_window(notification);
 }
 completionHandler();
 }
 }
 /* Internal box packing function called by the other 3 functions */
 void _dw_box_pack(HWND box, HWND item, int index, int width, int height, int hsize, int vsize, int pad, char *funcname)
 {
-//int _locked_by_me = FALSE;
-//DW_MUTEX_LOCK;
 id object = box;
 DWBox *view = box;
 DWBox *this = item;
 Box *thisbox;
 int z, x = 0;
 _dw_redraw([view window], TRUE);
 /* Free the old data */
 if(thisitem)
 free(thisitem);
-//DW_MUTEX_UNLOCK;
 }
 /*
 * Remove windows (widgets) from the box they are packed into.
 * Parameters:
 vsnprintf(outbuf, 1024, description, args);
 va_end(args);
 }
 #ifdef BUILDING_FOR_MOJAVE
-// Configure the notification's payload.
+/* Configure the notification's payload. */
 if (@available(macOS 10.14, *))
 {
 if([[NSBundle mainBundle] bundleIdentifier] != nil)
 {
 UNMutableNotificationContent* notification = [[UNMutableNotificationContent alloc] init];
 }
 else
 #endif
 {
 #ifndef BUILDING_FOR_BIG_SUR
-// Fallback on earlier versions
+/* Fallback on earlier versions */
 NSUserNotification *notification = [[NSUserNotification alloc] init];
 if(notification)
 {
 notification.title = [NSString stringWithUTF8String:title];
 if(notification)
 {
 NSString *notid = [NSString stringWithFormat:@"dw-notification-%llu", DW_POINTER_TO_ULONGLONG(notification)];
 #ifdef BUILDING_FOR_MOJAVE
-// Schedule the notification.
+/* Schedule the notification. */
 if (@available(macOS 10.14, *))
 {
 if([[NSBundle mainBundle] bundleIdentifier] != nil)
 {
 UNMutableNotificationContent* content = (UNMutableNotificationContent *)notification;
 }
 else
 #endif
 {
 #ifndef BUILDING_FOR_BIG_SUR
-// Fallback on earlier versions
+/* Fallback on earlier versions */
 NSUserNotification *request = (NSUserNotification *)notification;
 request.identifier = notid;
 [[NSUserNotificationCenter defaultUserNotificationCenter] deliverNotification:request];
 #endif
 }

Mercurial > dwindows

comparison mac/dw.m @ 2179:bd6146d4bdbc