Changeset 24544

Timestamp:

07/31/2008 11:51:51 PM (4 months ago)

Author:

evands

Message:

Don't allow disclosure triangle area clicks on metacontacts to expand/collapse them. Fixes #9979 for real, yo.

Files:

• trunk/Frameworks/AIUtilities Framework/Source/AIMultiCellOutlineView.m (modified) (2 diffs)
• trunk/Frameworks/AIUtilities Framework/Source/AIVariableHeightOutlineView.h (modified) (1 diff)
• trunk/Frameworks/AIUtilities Framework/Source/AIVariableHeightOutlineView.m (modified) (3 diffs)

trunk/Frameworks/AIUtilities Framework/Source/AIMultiCellOutlineView.m

@@ -82 +82 @@
- * Called from mouseDown; separated out to let subclasses have finer granularity of control
- *
+ * @param theEvent The triggerring event
+ * @param needsExpandCollapseSuppression Pointer to a BOOL which, on return, will be YES if we need to prevent NSOutlineView from trying to expand/collapse a group.
+ *
- * @result YES if the event was handled; NO if it should be processed normally
- */
-
+ needsExpandCollapseSuppression:(BOOL *)needsExpandCollapseSuppression
-{
-        NSPoint viewPoint = [self convertPoint:[theEvent locationInWindow] fromView:nil]; 
@@ -92 +95 @@
-
-        //Expand/Collapse groups on mouse DOWN instead of mouse up (Makes it feel a ton faster) 
-[self delegate] outlineView:self isGroup
+self isExpandable
-                (viewPoint.x < NSHeight([self frameOfCellAtColumn:0 row:row]))) { 
-                /* XXX - This is kind of a hack.  We need to check < WidthOfDisclosureTriangle, and are using the fact that 
-                 *       the disclosure width is about the same as the height of the row to fudge it. -ai 
-                 */
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-                handled = YES;
-                
-        } else {
+                if (needsExpandCollapseSuppression) *needsExpandCollapseSuppression = NO;
-                handled = NO;
-        }

trunk/Frameworks/AIUtilities Framework/Source/AIVariableHeightOutlineView.h

@@ -20 +20 @@
-        BOOL    drawHighlightOnlyWhenMain;
-        BOOL    drawsSelectedRowHighlight;
+        
+        BOOL    suppressExpandCollapseRequests;
-}
-

trunk/Frameworks/AIUtilities Framework/Source/AIVariableHeightOutlineView.m

@@ -80 +80 @@
- * Called from mouseDown; separated out to let subclasses have finer granularity of control
- *
+ * @param theEvent The triggerring event
+ * @param needsExpandCollapseSuppression Pointer to a BOOL which, on return, will be YES if we need to prevent NSOutlineView from trying to expand/collapse a group.
+ *
- * @result YES if the event was handled; NO if it should be processed normally
- */
-
+ needsExpandCollapseSuppression:(BOOL *)needsExpandCollapseSuppression
-{
-        NSPoint viewPoint = [self convertPoint:[theEvent locationInWindow] fromView:nil]; 
@@ -106 +109 @@
-        }
-        
+        if (needsExpandCollapseSuppression) *needsExpandCollapseSuppression = NO;
+        
-        return handled;
+}
+
+- (void)collapseItem:(id)item collapseChildren:(BOOL)collapseChildren
+{
+        if (!suppressExpandCollapseRequests)
+                [super collapseItem:item collapseChildren:collapseChildren];
+}
+
+- (void)expandItem:(id)item expandChildren:(BOOL)expandChildren;
+{
+        if (!suppressExpandCollapseRequests)
+                [super expandItem:item expandChildren:expandChildren];
-}
-
@@ -112 +129 @@
-- (void)mouseDown:(NSEvent *)theEvent 
-{ 
-
+
+
+
-                [super mouseDown:theEvent]; 
+                suppressExpandCollapseRequests = NO;
+        }
-} 
-