colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-08-25 04:57:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

CPTabView: Do not track the segment when the delegate disallows item selection.

Browse Source
This commit is contained in:
cacaodev
2012-02-13 00:32:22 +01:00
parent a0eadc6c4a
commit d581dec6cf
4 changed files with 56 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPTabView.j
+5 -6
View File
@@ -273,7 +273,7 @@ var CPTabViewDidSelectTabViewItemSelector = 1,
Selects the item at the specified index. Selects the item at the specified index.
@param anIndex the index of the item to display. @param anIndex the index of the item to display.
*/ */
- (void)selectTabViewItemAtIndex:(unsigned)anIndex - (BOOL)selectTabViewItemAtIndex:(unsigned)anIndex
{ {
if (anIndex === _selectedIndex) if (anIndex === _selectedIndex)
return; return;
@@ -281,7 +281,7 @@ var CPTabViewDidSelectTabViewItemSelector = 1,
var aTabViewItem = [self tabViewItemAtIndex:anIndex]; var aTabViewItem = [self tabViewItemAtIndex:anIndex];
if ((_delegateSelectors & CPTabViewShouldSelectTabViewItemSelector) && ![_delegate tabView:self shouldSelectTabViewItem:aTabViewItem]) if ((_delegateSelectors & CPTabViewShouldSelectTabViewItemSelector) && ![_delegate tabView:self shouldSelectTabViewItem:aTabViewItem])
return; return NO;
if (_delegateSelectors & CPTabViewWillSelectTabViewItemSelector) if (_delegateSelectors & CPTabViewWillSelectTabViewItemSelector)
[_delegate tabView:self willSelectTabViewItem:aTabViewItem]; [_delegate tabView:self willSelectTabViewItem:aTabViewItem];
@@ -291,6 +291,8 @@ var CPTabViewDidSelectTabViewItemSelector = 1,
if (_delegateSelectors & CPTabViewDidSelectTabViewItemSelector) if (_delegateSelectors & CPTabViewDidSelectTabViewItemSelector)
[_delegate tabView:self didSelectTabViewItem:aTabViewItem]; [_delegate tabView:self didSelectTabViewItem:aTabViewItem];
return YES;
} }
/*! /*!
@@ -431,11 +433,8 @@ var CPTabViewDidSelectTabViewItemSelector = 1,
{ {
var segmentIndex = [_tabs testSegment:[_tabs convertPoint:[anEvent locationInWindow] fromView:nil]]; var segmentIndex = [_tabs testSegment:[_tabs convertPoint:[anEvent locationInWindow] fromView:nil]];
if (segmentIndex != CPNotFound) if (segmentIndex != CPNotFound && [self selectTabViewItemAtIndex:segmentIndex])
{
[self selectTabViewItemAtIndex:segmentIndex];
[_tabs trackSegment:anEvent]; [_tabs trackSegment:anEvent];
}
} }
- (void)_repositionTabs - (void)_repositionTabs
Tests/Manual/CPTabViewNib/AppController.j
+5
View File
@@ -42,4 +42,9 @@
CPLogConsole(_cmd + [tabViewItem label]); CPLogConsole(_cmd + [tabViewItem label]);
} }
- (void)tabView:(CPTabView)aTabView shouldSelectTabViewItem:(CPTabViewItem)tabViewItem
{
return [tabViewItem identifier] != @"unselectable";
}
@end @end
Tests/Manual/CPTabViewNib/Resources/MainMenu.cib
+1 -1
View File
File diff suppressed because one or more lines are too long
Tests/Manual/CPTabViewNib/Resources/MainMenu.xib
+45 -13
View File
@@ -63,6 +63,7 @@
<string key="NSFrame">{{13, 40}, {454, 344}}</string> <string key="NSFrame">{{13, 40}, {454, 344}}</string>
<reference key="NSSuperview" ref="439893737"/> <reference key="NSSuperview" ref="439893737"/>
<reference key="NSWindow"/> <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="18873805"/>
<object class="NSMutableArray" key="NSTabViewItems"> <object class="NSMutableArray" key="NSTabViewItems">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTabViewItem" id="488469955"> <object class="NSTabViewItem" id="488469955">
@@ -77,6 +78,7 @@
<int key="NSvFlags">301</int> <int key="NSvFlags">301</int>
<string key="NSFrame">{{164, 243}, {96, 21}}</string> <string key="NSFrame">{{164, 243}, {96, 21}}</string>
<reference key="NSSuperview" ref="378428221"/> <reference key="NSSuperview" ref="378428221"/>
<reference key="NSNextKeyView" ref="979039271"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSSliderCell" key="NSCell" id="600801425"> <object class="NSSliderCell" key="NSCell" id="600801425">
<int key="NSCellFlags">-2080244224</int> <int key="NSCellFlags">-2080244224</int>
@@ -100,6 +102,7 @@
</object> </object>
</object> </object>
<string key="NSFrame">{{10, 33}, {434, 298}}</string> <string key="NSFrame">{{10, 33}, {434, 298}}</string>
<reference key="NSNextKeyView" ref="974764906"/>
</object> </object>
<string key="NSLabel">Tab</string> <string key="NSLabel">Tab</string>
<object class="NSColor" key="NSColor" id="199260378"> <object class="NSColor" key="NSColor" id="199260378">
@@ -113,11 +116,24 @@
</object> </object>
<reference key="NSTabView" ref="979039271"/> <reference key="NSTabView" ref="979039271"/>
</object> </object>
<object class="NSTabViewItem" id="767904222"> <object class="NSTabViewItem" id="256931374">
<string key="NSIdentifier">2</string> <object class="NSView" key="NSView" id="18873805">
<object class="NSView" key="NSView" id="802661891">
<reference key="NSNextResponder" ref="979039271"/> <reference key="NSNextResponder" ref="979039271"/>
<int key="NSvFlags">256</int> <int key="NSvFlags">256</int>
<string key="NSFrame">{{10, 33}, {434, 298}}</string>
<reference key="NSSuperview" ref="979039271"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="513383460"/>
</object>
<string key="NSLabel">View</string>
<reference key="NSColor" ref="199260378"/>
<reference key="NSTabView" ref="979039271"/>
</object>
<object class="NSTabViewItem" id="767904222">
<string key="NSIdentifier">unselectable</string>
<object class="NSView" key="NSView" id="802661891">
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews"> <object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTextField" id="160623561"> <object class="NSTextField" id="160623561">
@@ -125,8 +141,6 @@
<int key="NSvFlags">301</int> <int key="NSvFlags">301</int>
<string key="NSFrame">{{169, 246}, {96, 22}}</string> <string key="NSFrame">{{169, 246}, {96, 22}}</string>
<reference key="NSSuperview" ref="802661891"/> <reference key="NSSuperview" ref="802661891"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="513383460"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="46991665"> <object class="NSTextFieldCell" key="NSCell" id="46991665">
<int key="NSCellFlags">-1804468671</int> <int key="NSCellFlags">-1804468671</int>
@@ -161,23 +175,21 @@
</object> </object>
</object> </object>
<string key="NSFrame">{{10, 33}, {434, 298}}</string> <string key="NSFrame">{{10, 33}, {434, 298}}</string>
<reference key="NSSuperview" ref="979039271"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="160623561"/> <reference key="NSNextKeyView" ref="160623561"/>
</object> </object>
<string key="NSLabel">View</string> <string key="NSLabel">Not Selectable</string>
<reference key="NSColor" ref="199260378"/> <reference key="NSColor" ref="199260378"/>
<reference key="NSTabView" ref="979039271"/> <reference key="NSTabView" ref="979039271"/>
</object> </object>
</object> </object>
<reference key="NSSelectedTabViewItem" ref="767904222"/> <reference key="NSSelectedTabViewItem" ref="256931374"/>
<reference key="NSFont" ref="447530061"/> <reference key="NSFont" ref="447530061"/>
<int key="NSTvFlags">0</int> <int key="NSTvFlags">0</int>
<bool key="NSAllowTruncatedLabels">YES</bool> <bool key="NSAllowTruncatedLabels">YES</bool>
<bool key="NSDrawsBackground">YES</bool> <bool key="NSDrawsBackground">YES</bool>
<object class="NSMutableArray" key="NSSubviews"> <object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="802661891"/> <reference ref="18873805"/>
</object> </object>
</object> </object>
<object class="NSTabView" id="513383460"> <object class="NSTabView" id="513383460">
@@ -200,7 +212,7 @@
<string key="NSFrame">{{594, 14}, {222, 17}}</string> <string key="NSFrame">{{594, 14}, {222, 17}}</string>
<reference key="NSSuperview" ref="439893737"/> <reference key="NSSuperview" ref="439893737"/>
<reference key="NSWindow"/> <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1045251964"/> <reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:3944</string> <string key="NSReuseIdentifierKey">_NS:3944</string>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="822028531"> <object class="NSTextFieldCell" key="NSCell" id="822028531">
@@ -225,6 +237,7 @@
<string key="NSFrame">{{153, 4}, {174, 32}}</string> <string key="NSFrame">{{153, 4}, {174, 32}}</string>
<reference key="NSSuperview" ref="439893737"/> <reference key="NSSuperview" ref="439893737"/>
<reference key="NSWindow"/> <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="405808750"/>
<string key="NSReuseIdentifierKey">_NS:687</string> <string key="NSReuseIdentifierKey">_NS:687</string>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="299997884"> <object class="NSButtonCell" key="NSCell" id="299997884">
@@ -360,9 +373,9 @@
<object class="NSMutableArray" key="children"> <object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="513383460"/> <reference ref="513383460"/>
<reference ref="979039271"/>
<reference ref="405808750"/> <reference ref="405808750"/>
<reference ref="1045251964"/> <reference ref="1045251964"/>
<reference ref="979039271"/>
</object> </object>
<reference key="parent" ref="972006081"/> <reference key="parent" ref="972006081"/>
</object> </object>
@@ -378,6 +391,7 @@
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="488469955"/> <reference ref="488469955"/>
<reference ref="767904222"/> <reference ref="767904222"/>
<reference ref="256931374"/>
</object> </object>
<reference key="parent" ref="439893737"/> <reference key="parent" ref="439893737"/>
</object> </object>
@@ -481,6 +495,20 @@
<reference key="object" ref="299997884"/> <reference key="object" ref="299997884"/>
<reference key="parent" ref="1045251964"/> <reference key="parent" ref="1045251964"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">488</int>
<reference key="object" ref="256931374"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="18873805"/>
</object>
<reference key="parent" ref="979039271"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">489</int>
<reference key="object" ref="18873805"/>
<reference key="parent" ref="256931374"/>
</object>
</object> </object>
</object> </object>
<object class="NSMutableDictionary" key="flattenedProperties"> <object class="NSMutableDictionary" key="flattenedProperties">
@@ -509,6 +537,8 @@
<string>476.IBPluginDependency</string> <string>476.IBPluginDependency</string>
<string>479.IBPluginDependency</string> <string>479.IBPluginDependency</string>
<string>480.IBPluginDependency</string> <string>480.IBPluginDependency</string>
<string>488.IBPluginDependency</string>
<string>489.IBPluginDependency</string>
</object> </object>
<object class="NSArray" key="dict.values"> <object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
@@ -534,6 +564,8 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object> </object>
</object> </object>
<object class="NSMutableDictionary" key="unlocalizedProperties"> <object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -548,7 +580,7 @@
<reference key="dict.values" ref="1049"/> <reference key="dict.values" ref="1049"/>
</object> </object>
<nil key="sourceID"/> <nil key="sourceID"/>
<int key="maxID">487</int> <int key="maxID">489</int>
</object> </object>
<object class="IBClassDescriber" key="IBDocument.Classes"> <object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions"> <object class="NSMutableArray" key="referencedPartialClassDescriptions">