Changeset 24064

Timestamp:

06/24/2008 07:33:04 PM (5 months ago)

Author:

evands

Message:

Toggle between the minimum width and the previous width when double clicking the resizing bar or thumb of a shelf view rather than hiding it permanently. Fixes #10127

Files:

• trunk/Source/KNShelfSplitView.h (modified) (1 diff)
• trunk/Source/KNShelfSplitView.m (modified) (4 diffs)

trunk/Source/KNShelfSplitView.h

@@ -47 +47 @@
-        NSColor *                                       shelfBackgroundColor;
-        float                                           currentShelfWidth;
+        float                                           prevShelfWidthBeforeDoubleClick;
-        BOOL                                            isShelfVisible;
-        NSMenu *                                        contextButtonMenu;

trunk/Source/KNShelfSplitView.m

@@ -85 +85 @@
-                
-                currentShelfWidth = DEFAULT_SHELF_WIDTH; //change this
+                prevShelfWidthBeforeDoubleClick = currentShelfWidth;
-                isShelfVisible = YES;
-                shouldHilite = NO;
@@ -221 +222 @@
-}
-
+-(float)minimumShelfWidth
+{
+        // The shelf can never be completely closed. We always have at least enough to show our resize thumb, otherwise
+        // if the delegate responds to shelfSplitView:validateWidth:, we use that width as our minimum shelf size
+        float                           minShelf = THUMB_WIDTH;
+        if( delegateHasValidateWidth ){
+                float                           requestedWidth = [delegate shelfSplitView:self validateWidth: 0];
+                if( requestedWidth > minShelf ){
+                        minShelf = requestedWidth;
+                }
+        }
+        
+        return minShelf;
+}
+
--(void)setShelfWidth:(float)aWidth{
-
-
-
+
+
-        // The shelf can never be completely closed. We always have at least enough to show our resize thumb, otherwise
-        // if the delegate responds to shelfSplitView:validateWidth:, we use that width as our minimum shelf size
@@ -234 +249 @@
-                }
-        }
+        
-        if( minShelf > newWidth ){
-                newWidth = minShelf;
@@ -412 +428 @@
-        if( activeControlPart != CONTROL_PART_NONE ){
-                if([anEvent clickCount] == 2){
-
+
+
+
+
+
+
+
+
+
+
-                } else {
-                while( stillMouseDown ){