Changeset 433

Timestamp:

03/ 3/08 9:25:06 AM (9 months ago)

Author:

nicholas

Message:

Undocumented method / hack fallback to determine whether we should draw the highlighted row as active.

Files:

• trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEInvertingTextFieldCell.m (modified) (1 diff)
• trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEMenuOutlineView.h (modified) (1 diff)
• trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEMenuOutlineView.m (modified) (3 diffs)
• trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEServicePrefController.m (modified) (1 diff)

trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEInvertingTextFieldCell.m

@@ -20 +20 @@
-- (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView;
-{
-
-
+
-        NSMutableAttributedString *astr = [[self attributedStringValue] mutableCopy];
-        unsigned location = 0, length = [astr length];

trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEMenuOutlineView.h

@@ -9 +9 @@
-#import <Cocoa/Cocoa.h>
-
+BOOL ICCF_ViewHasKeyboardFocus(NSView *view);
-
-@interface ICeCoffEEMenuOutlineView : NSOutlineView {
-
+
-}
-
-- (BOOL)shouldUseActiveHighlight;
-
-@end

trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEMenuOutlineView.m

@@ -10 +10 @@
-#import <Carbon/Carbon.h>
-
+// Tiger or later, indicates whether highlighted row should draw as active
+@interface NSWindow (IC_KeyboardFocus)
+- (BOOL)_isKeyWindowIgnoringFocus;
+@end
+
+BOOL ICCF_ViewHasKeyboardFocus(NSView *view) {
+    NSWindow *window = [view window];
+    if ([window firstResponder] != view)
+        return NO;
+    
+    if ([window respondsToSelector: @selector(_isKeyWindowIgnoringFocus)])
+        return [window _isKeyWindowIgnoringFocus];
+    
+    // XXX is there a documented way to do this?
+    // see <http://lists.apple.com/archives/cocoa-dev/2008/Mar/msg00036.html>
+    
+    // test cases:
+    // - About System Preferences...
+    // - focused character palette
+    // - Help menu search (Shortcut)
+    // - menu extras
+    NSWindow *keyWindow = [NSApp keyWindow];
+    if (window != keyWindow && (keyWindow == nil || [keyWindow isKindOfClass: [NSPanel class]]))
+        return NO; // exclude NSCarbonMenuWindow
+    
+    return YES;
+}
+
-@implementation ICeCoffEEMenuOutlineView
-
@@ -18 +46 @@
-}
-
-// maintains main window (e.g., window to which sheet is attached) for use by shouldUseActiveHighlight
-- (void)viewDidMoveToWindow;
-{
-    mainWindow = [NSApp mainWindow];
-    [super viewDidMoveToWindow];
-}
-
-- (BOOL)shouldUseActiveHighlight;
-{
-    return NO;
-
-
-
-
-
-
-
-
-
-
+
-}
-
@@ -46 +58 @@
-
-    HIThemeMenuItemDrawInfo drawInfo = {0, kThemeMenuItemHierBackground | kThemeMenuItemPopUpBackground, kThemeMenuSelected};
-
-
-
+
-        [super highlightSelectionInClipRect: clipRect];
-        instrumentObjcMessageSends(NO);
-        return;
-    }

trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEServicePrefController.m

@@ -478 +478 @@
-    
-    if (![outlineView isRowSelected: [outlineView rowForItem: item]] ||
-[(ICeCoffEEMenuOutlineView *)outlineView shouldUseActiveHighlight]
+ICCF_ViewHasKeyboardFocus(outlineView)
-        if (!isInverted)
-            return;