Revision: 3797
http://skim-app.svn.sourceforge.net/skim-app/?rev=3797&view=rev
Author: hofman
Date: 2008-04-23 02:50:39 -0700 (Wed, 23 Apr 2008)
Log Message:
-----------
Use super to get standard accessibility attributes for color swatch.
Modified Paths:
--------------
trunk/SKColorSwatch.m
Modified: trunk/SKColorSwatch.m
===================================================================
--- trunk/SKColorSwatch.m 2008-04-22 23:48:18 UTC (rev 3796)
+++ trunk/SKColorSwatch.m 2008-04-23 09:50:39 UTC (rev 3797)
@@ -546,17 +546,17 @@
- (NSArray *)accessibilityAttributeNames {
static NSArray *attributes = nil;
if (attributes == nil) {
- attributes = [[NSArray alloc] initWithObjects:
- NSAccessibilityRoleAttribute,
- NSAccessibilityRoleDescriptionAttribute,
- NSAccessibilityChildrenAttribute,
- NSAccessibilityContentsAttribute,
- NSAccessibilityParentAttribute,
- NSAccessibilityWindowAttribute,
- NSAccessibilityTopLevelUIElementAttribute,
- NSAccessibilityPositionAttribute,
- NSAccessibilitySizeAttribute,
- nil];
+ attributes = [[NSArray alloc] initWithObjects:
+ NSAccessibilityRoleAttribute,
+ NSAccessibilityRoleDescriptionAttribute,
+ NSAccessibilityChildrenAttribute,
+ NSAccessibilityContentsAttribute,
+ NSAccessibilityParentAttribute,
+ NSAccessibilityWindowAttribute,
+ NSAccessibilityTopLevelUIElementAttribute,
+ NSAccessibilityPositionAttribute,
+ NSAccessibilitySizeAttribute,
+ nil];
}
return attributes;
}
@@ -572,25 +572,6 @@
for (i = 0; i < count; i++)
[children addObject:[[[SKAccessibilityColorSwatchElement alloc]
initWithIndex:i colorSwatch:self] autorelease]];
return NSAccessibilityUnignoredChildren(children);
- } else if ([attribute isEqualToString:NSAccessibilityParentAttribute]) {
- id parent = [self superview];
- if (parent == nil)
- parent = [self window];
- return NSAccessibilityUnignoredAncestor(parent);
- } else if ([attribute isEqualToString:NSAccessibilityWindowAttribute]) {
- id parent = [self superview];
- if (parent == nil)
- parent = [self window];
- return [NSAccessibilityUnignoredAncestor(parent)
accessibilityAttributeValue:NSAccessibilityWindowAttribute];
- } else if ([attribute
isEqualToString:NSAccessibilityTopLevelUIElementAttribute]) {
- id parent = [self superview];
- if (parent == nil)
- parent = [self window];
- return [NSAccessibilityUnignoredAncestor(parent)
accessibilityAttributeValue:NSAccessibilityTopLevelUIElementAttribute];
- } else if ([attribute isEqualToString:NSAccessibilityPositionAttribute]) {
- return [NSValue valueWithPoint:[[self window]
convertBaseToScreen:[self convertPoint:[self bounds].origin toView:nil]]];
- } else if ([attribute isEqualToString:NSAccessibilitySizeAttribute]) {
- return [NSValue valueWithSize:[self convertSize:[self bounds].size
toView:nil]];
} else {
return [super accessibilityAttributeValue:attribute];
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
