dwindows: mac/dw.m comparison

Mac: Attempt to restore the Container/Listbox focus rings. This used to work before switching to NSView based instead of NSCell based NSTableViews.

comparison

equal deleted inserted replaced

-:a43a3f80ed32
+:70460d0afd03
 [tf setFrame:rect];
 }
 }
 #endif
+@interface DWFocusRingScrollView : NSScrollView
+{
+BOOL shouldDrawFocusRing;
+NSResponder* lastResp;
+}
+@end
+@implementation DWFocusRingScrollView
+-(BOOL)needsDisplay;
+{
+NSResponder* resp = nil;
+if([[self window] isKeyWindow])
+{
+resp = [[self window] firstResponder];
+if (resp == lastResp)
+return [super needsDisplay];
+}
+else if (lastResp == nil)
+{
+return [super needsDisplay];
+}
+shouldDrawFocusRing = (resp != nil && [resp isKindOfClass:[NSView class]] && [(NSView*)resp isDescendantOf:self]);
+lastResp = resp;
+[self setKeyboardFocusRingNeedsDisplayInRect:[self bounds]];
+return YES;
+}
+-(void)drawRect:(NSRect)rect
+{
+[super drawRect:rect];
+if(shouldDrawFocusRing)
+{
+NSSetFocusRingStyle(NSFocusRingOnly);
+NSRectFill(rect);
+}
+}
+@end
 /* Subclass for a Container/List type */
 @interface DWContainer : NSTableView
 #ifdef BUILDING_FOR_SNOW_LEOPARD
 <NSTableViewDataSource,NSTableViewDelegate>
 #endif
 }
 /* Internal common function to create containers and listboxes */
 HWND _dw_cont_new(ULONG cid, int multi)
 {
-NSScrollView *scrollview  = [[NSScrollView alloc] init];
+DWFocusRingScrollView *scrollview  = [[DWFocusRingScrollView alloc] init];
 DWContainer *cont = [[DWContainer alloc] init];
 [cont setScrollview:scrollview];
 [scrollview setBorderType:NSBezelBorder];
 [scrollview setHasVerticalScroller:YES];

Mercurial > dwindows