Changeset 432 for trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEMenuOutlineView.m

Timestamp:

03/03/08 08:59:32 (16 years ago)

Author:

Nicholas Riley

Message:

Fragile hack to determine whether we should draw the highlighted row as active.

File:

• trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEMenuOutlineView.m (modified) (2 diffs)

trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEMenuOutlineView.m

@@ -18 +18 @@
 }
 
+// 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;
+    // test cases: - XXX there should be a better way to do this
+    // see <http://lists.apple.com/archives/cocoa-dev/2008/Mar/msg00036.html>
+    // - About System Preferences...
+    // - focused character palette
+    // - Help menu search (Shortcut)
+    // - menu extras
+    NSWindow *keyWindow = [NSApp keyWindow], *thisWindow = [self window];
+    if (keyWindow != thisWindow && [keyWindow isKindOfClass: [NSPanel class]])
+        return NO; // exclude NSCarbonMenuWindow
+    return [thisWindow firstResponder] == self && [NSApp mainWindow] == mainWindow;
+}
+
 - (void)highlightSelectionInClipRect:(NSRect)clipRect;
 {
@@ -24 +46 @@
 
     HIThemeMenuItemDrawInfo drawInfo = {0, kThemeMenuItemHierBackground | kThemeMenuItemPopUpBackground, kThemeMenuSelected};
-    if ([[self window] firstResponder] != self || [NSApp keyWindow] != [self window]) {
-        NSLog(@"firstResponder %@ key %@ main %@ this %@", [[self window] firstResponder], [NSApp keyWindow], [NSApp mainWindow], [self window]);
+    NSLog(@"firstResponder %@ key %@ isKey %d main %@", [[self window] firstResponder], [NSApp keyWindow], [[self window] isKeyWindow], [NSApp mainWindow]);
+    if (![self shouldUseActiveHighlight]) {
+        instrumentObjcMessageSends(YES);
         [super highlightSelectionInClipRect: clipRect];
+        instrumentObjcMessageSends(NO);
         return;
     }