Changeset 467 for trunk/ICeCoffEE

Timestamp:

04/17/08 02:12:15 (17 years ago)

Author:

Nicholas Riley

Message:

Disable on list boxes.

File:

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

trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEWebKit.m

@@ -57 +57 @@
 static id /* DOMRange */ selectedRange;
 
-- (void)mouseDown:(NSEvent *)e;
-{
-    [downEvent release]; downEvent = nil;
-    if (ICCF_enabled && ICCF_prefs.commandClickEnabled && ICCF_EventIsCommandMouseDown(e)) {
-        if ([self respondsToSelector: @selector(_webView)]) {
-            WebView *webView = [(WebHTMLView *)self _webView];
-            
-            // save selection: it may be deselected on super mouseDown
-            selectedRange = [[webView selectedDOMRange] retain];
-            
-            // stop any URL launching from happening
-            if ([webView isEditable]) {
-                policyDelegate = [[webView policyDelegate] retain];
-                [webView setPolicyDelegate: [ICeCoffEEWebPolicyDelegate sharedDelegate]];
-            }
-            
-            downEvent = [e retain];
-        }
-    }
-    [super mouseDown: e];
-}
-
-
 static BOOL ICCF_DOMParentOfClass(DOMNode *node, Class cls) {
     do {
@@ -90 +67 @@
 #define ICCF_NodeIs(elt) [clickedNode isKindOfClass: NSClassFromString(@"DOMHTML"elt"Element")]
 #define ICCF_DOMParentIs(elt) ICCF_DOMParentOfClass(clickedNode, NSClassFromString(@"DOMHTML"elt"Element"))
+
+- (void)mouseDown:(NSEvent *)e;
+{
+    [downEvent release]; downEvent = nil;
+    if (ICCF_enabled && ICCF_prefs.commandClickEnabled && ICCF_EventIsCommandMouseDown(e)) {
+        if ([self respondsToSelector: @selector(_webView)]) {
+            WebView *webView = [(WebHTMLView *)self _webView];
+            
+            // check that the Command-click isn't being used for discontiguous selection
+            NSPoint viewClickPt = [webView convertPoint: [e locationInWindow] fromView: nil];
+            NSDictionary *elementDict = [webView elementAtPoint: viewClickPt];
+            DOMNode *clickedNode = [elementDict objectForKey: @"WebElementDOMNode"];
+            if (clickedNode != nil && ICCF_NodeIs("Select")) {
+                [super mouseDown: e];
+                return;
+            }
+            
+            // save selection: it may be deselected on super mouseDown
+            selectedRange = [[webView selectedDOMRange] retain];
+            
+            // stop any URL launching from happening
+            if ([webView isEditable]) {
+                policyDelegate = [[webView policyDelegate] retain];
+                [webView setPolicyDelegate: [ICeCoffEEWebPolicyDelegate sharedDelegate]];
+            }
+            
+            downEvent = [e retain];
+        }
+    }
+    [super mouseDown: e];
+}
 
 - (void)mouseUp:(NSEvent *)e;