-
Notifications
You must be signed in to change notification settings - Fork 236
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
8264299: Create implementation of native accessibility peer for Scrol…
…lPane and ScrollBar Java Accessibility roles Reviewed-by: phh Backport-of: 6c107fd
- Loading branch information
1 parent
915ac57
commit 8a726af
Showing
7 changed files
with
247 additions
and
122 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 41 additions & 0 deletions
41
src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/ScrollAreaAccessibility.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
/* | ||
* Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved. | ||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
* | ||
* This code is free software; you can redistribute it and/or modify it | ||
* under the terms of the GNU General Public License version 2 only, as | ||
* published by the Free Software Foundation. Oracle designates this | ||
* particular file as subject to the "Classpath" exception as provided | ||
* by Oracle in the LICENSE file that accompanied this code. | ||
* | ||
* This code is distributed in the hope that it will be useful, but WITHOUT | ||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
* version 2 for more details (a copy is included in the LICENSE file that | ||
* accompanied this code). | ||
* | ||
* You should have received a copy of the GNU General Public License version | ||
* 2 along with this work; if not, write to the Free Software Foundation, | ||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
* | ||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | ||
* or visit www.oracle.com if you need additional information or have any | ||
* questions. | ||
*/ | ||
|
||
#import "JavaComponentAccessibility.h" | ||
#import "CommonComponentAccessibility.h" | ||
|
||
#import <AppKit/AppKit.h> | ||
|
||
@interface ScrollAreaAccessibility : CommonComponentAccessibility { | ||
|
||
}; | ||
- (NSString * _Nonnull)accessibilityRole; | ||
- (NSArray * _Nullable)accessibilityContents; | ||
- (id _Nullable)accessibilityHorizontalScrollBar; | ||
- (id _Nullable)accessibilityVerticalScrollBar; | ||
|
||
- (NSArray * _Nullable)accessibilityContentsAttribute; | ||
- (id _Nullable)getScrollBarwithOrientation:(enum NSAccessibilityOrientation)orientation; | ||
@end |
105 changes: 105 additions & 0 deletions
105
src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/ScrollAreaAccessibility.m
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,105 @@ | ||
/* | ||
* Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved. | ||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
* | ||
* This code is free software; you can redistribute it and/or modify it | ||
* under the terms of the GNU General Public License version 2 only, as | ||
* published by the Free Software Foundation. Oracle designates this | ||
* particular file as subject to the "Classpath" exception as provided | ||
* by Oracle in the LICENSE file that accompanied this code. | ||
* | ||
* This code is distributed in the hope that it will be useful, but WITHOUT | ||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
* version 2 for more details (a copy is included in the LICENSE file that | ||
* accompanied this code). | ||
* | ||
* You should have received a copy of the GNU General Public License version | ||
* 2 along with this work; if not, write to the Free Software Foundation, | ||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
* | ||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | ||
* or visit www.oracle.com if you need additional information or have any | ||
* questions. | ||
*/ | ||
|
||
#import "ScrollAreaAccessibility.h" | ||
#import "ThreadUtilities.h" | ||
#import "JNIUtilities.h" | ||
|
||
/* | ||
* Implementation of the accessibility peer for the ScrollArea role | ||
*/ | ||
@implementation ScrollAreaAccessibility | ||
|
||
- (NSArray * _Nullable)accessibilityContentsAttribute | ||
{ | ||
JNIEnv *env = [ThreadUtilities getJNIEnv]; | ||
NSArray *children = [JavaComponentAccessibility childrenOfParent:self withEnv:env withChildrenCode:JAVA_AX_ALL_CHILDREN allowIgnored:YES]; | ||
|
||
if ([children count] <= 0) return nil; | ||
NSArray *contents = [NSMutableArray arrayWithCapacity:[children count]]; | ||
|
||
// The scroll bars are in the children. children less the scroll bars is the contents | ||
NSEnumerator *enumerator = [children objectEnumerator]; | ||
JavaComponentAccessibility *aElement; | ||
while ((aElement = (JavaComponentAccessibility *)[enumerator nextObject])) { | ||
if (![[aElement accessibilityRoleAttribute] isEqualToString:NSAccessibilityScrollBarRole]) { | ||
// no scroll bars in contents | ||
[(NSMutableArray *)contents addObject:aElement]; | ||
} | ||
} | ||
return contents; | ||
} | ||
|
||
- (id _Nullable)getScrollBarwithOrientation:(enum NSAccessibilityOrientation)orientation | ||
{ | ||
JNIEnv *env = [ThreadUtilities getJNIEnv]; | ||
|
||
NSArray *children = [JavaComponentAccessibility childrenOfParent:self withEnv:env withChildrenCode:JAVA_AX_ALL_CHILDREN allowIgnored:YES]; | ||
if ([children count] <= 0) return nil; | ||
|
||
// The scroll bars are in the children. | ||
JavaComponentAccessibility *aElement; | ||
NSEnumerator *enumerator = [children objectEnumerator]; | ||
while ((aElement = (JavaComponentAccessibility *)[enumerator nextObject])) { | ||
if ([[aElement accessibilityRoleAttribute] isEqualToString:NSAccessibilityScrollBarRole]) { | ||
jobject elementAxContext = [aElement axContextWithEnv:env]; | ||
if (orientation == NSAccessibilityOrientationHorizontal) { | ||
if (isHorizontal(env, elementAxContext, fComponent)) { | ||
(*env)->DeleteLocalRef(env, elementAxContext); | ||
return aElement; | ||
} | ||
} else if (orientation == NSAccessibilityOrientationVertical) { | ||
if (isVertical(env, elementAxContext, fComponent)) { | ||
(*env)->DeleteLocalRef(env, elementAxContext); | ||
return aElement; | ||
} | ||
} else { | ||
(*env)->DeleteLocalRef(env, elementAxContext); | ||
} | ||
} | ||
} | ||
return nil; | ||
} | ||
|
||
- (NSString * _Nonnull)accessibilityRole | ||
{ | ||
return [self accessibilityRoleAttribute]; | ||
} | ||
|
||
- (NSArray * _Nullable)accessibilityContents | ||
{ | ||
return [self accessibilityContentsAttribute]; | ||
} | ||
|
||
- (id _Nullable)accessibilityHorizontalScrollBar | ||
{ | ||
return [self getScrollBarwithOrientation:NSAccessibilityOrientationHorizontal]; | ||
} | ||
|
||
- (id _Nullable)accessibilityVerticalScrollBar | ||
{ | ||
return [self getScrollBarwithOrientation:NSAccessibilityOrientationVertical]; | ||
} | ||
@end |
36 changes: 36 additions & 0 deletions
36
src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/ScrollBarAccessibility.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
/* | ||
* Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved. | ||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
* | ||
* This code is free software; you can redistribute it and/or modify it | ||
* under the terms of the GNU General Public License version 2 only, as | ||
* published by the Free Software Foundation. Oracle designates this | ||
* particular file as subject to the "Classpath" exception as provided | ||
* by Oracle in the LICENSE file that accompanied this code. | ||
* | ||
* This code is distributed in the hope that it will be useful, but WITHOUT | ||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
* version 2 for more details (a copy is included in the LICENSE file that | ||
* accompanied this code). | ||
* | ||
* You should have received a copy of the GNU General Public License version | ||
* 2 along with this work; if not, write to the Free Software Foundation, | ||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
* | ||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | ||
* or visit www.oracle.com if you need additional information or have any | ||
* questions. | ||
*/ | ||
|
||
#import "JavaComponentAccessibility.h" | ||
#import "CommonComponentAccessibility.h" | ||
|
||
#import <AppKit/AppKit.h> | ||
|
||
@interface ScrollBarAccessibility : CommonComponentAccessibility { | ||
|
||
}; | ||
- (NSString * _Nonnull)accessibilityRole; | ||
- (NSAccessibilityOrientation) accessibilityOrientation; | ||
@end |
Oops, something went wrong.
8a726af
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Review
Issues