Revision: 3758
http://skim-app.svn.sourceforge.net/skim-app/?rev=3758&view=rev
Author: hofman
Date: 2008-04-18 08:27:47 -0700 (Fri, 18 Apr 2008)
Log Message:
-----------
Fix and add position and size accessibility attributes of custom views.
Modified Paths:
--------------
trunk/SKColorSwatch.m
trunk/SKLineWell.m
Modified: trunk/SKColorSwatch.m
===================================================================
--- trunk/SKColorSwatch.m 2008-04-18 15:11:10 UTC (rev 3757)
+++ trunk/SKColorSwatch.m 2008-04-18 15:27:47 UTC (rev 3758)
@@ -553,6 +553,8 @@
NSAccessibilityParentAttribute,
NSAccessibilityWindowAttribute,
NSAccessibilityTopLevelUIElementAttribute,
+ NSAccessibilityPositionAttribute,
+ NSAccessibilitySizeAttribute,
nil];
}
return attributes;
@@ -584,6 +586,10 @@
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];
}
@@ -717,14 +723,12 @@
NSRect rect = NSInsetRect([colorSwatch bounds], 1.0, 1.0);
rect.size.width = NSHeight(rect);
rect.origin.x += index * (NSWidth(rect) - 1.0);
- rect.origin = [colorSwatch convertPoint:rect.origin toView:nil];
- return [NSValue valueWithPoint:rect.origin];
+ return [NSValue valueWithPoint:[[colorSwatch window]
convertBaseToScreen:[colorSwatch convertPoint:rect.origin toView:nil]]];
} else if ([attribute isEqualToString:NSAccessibilitySizeAttribute]) {
NSRect rect = NSInsetRect([colorSwatch bounds], 1.0, 1.0);
rect.size.width = NSHeight(rect);
rect.origin.x += index * (NSWidth(rect) - 1.0);
- rect.size = [colorSwatch convertSize:rect.size toView:nil];
- return [NSValue valueWithSize:rect.size];
+ return [NSValue valueWithSize:[colorSwatch convertSize:rect.size
toView:nil]];
} else {
return nil;
}
Modified: trunk/SKLineWell.m
===================================================================
--- trunk/SKLineWell.m 2008-04-18 15:11:10 UTC (rev 3757)
+++ trunk/SKLineWell.m 2008-04-18 15:27:47 UTC (rev 3758)
@@ -819,6 +819,8 @@
NSAccessibilityWindowAttribute,
NSAccessibilityTopLevelUIElementAttribute,
NSAccessibilityTitleUIElementAttribute,
+ NSAccessibilityPositionAttribute,
+ NSAccessibilitySizeAttribute,
nil];
}
return attributes;
@@ -847,6 +849,10 @@
return [NSAccessibilityUnignoredAncestor([self superview])
accessibilityAttributeValue:NSAccessibilityTopLevelUIElementAttribute];
} else if ([attribute
isEqualToString:NSAccessibilityTitleUIElementAttribute]) {
return titleUIElement;
+ } 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 nil;
}
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
