Attachment 115312 Details for Bug 251084 – patch to defer to the os unless the app specifies a new position or size

[patch] patch to defer to the os unless the app specifies a new position or size

_patch (text/plain), 2.29 KB, created by Carolyn MacLeod

on 2008-10-16 16:54:05 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Carolyn MacLeod

Created: 2008-10-16 16:54:05 EDT

Size: 2.29 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.swt
>Index: Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/Accessible.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/Accessible.java,v
>retrieving revision 1.1
>diff -u -r1.1 Accessible.java
>--- Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/Accessible.java	14 Oct 2008 23:36:20 -0000	1.1
>+++ Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/Accessible.java	16 Oct 2008 14:13:44 -0000
>@@ -896,7 +896,6 @@
> 	
> 	id getPositionAttribute (int childID) {
> 		id returnValue = null;
>-		NSPoint osPositionAttribute = new NSPoint ();
> 		AccessibleControlEvent event = new AccessibleControlEvent(this);
> 		event.childID = childID;
> 		event.width = -1;
>@@ -910,20 +909,17 @@
> 		
> 		if (event.width != -1) {
> 			// The point returned is the lower-left coordinate of the widget in lower-left relative screen coordinates.
>+			NSPoint osPositionAttribute = new NSPoint ();
> 			osPositionAttribute.x = event.x;
>-			osPositionAttribute.y = (int) (primaryMonitor.getBounds().height - event.y) - event.height;
>-		} else {
>-			Rectangle location = control.getBounds();
>-			Point pt = control.getParent().toDisplay(location.x, location.y);
>-			osPositionAttribute.x = pt.x;
>-			osPositionAttribute.y = (int) (primaryMonitor.getBounds().height - pt.y) - location.height;
>+			osPositionAttribute.y = primaryMonitor.getBounds().height - event.y - event.height;
>+			returnValue = NSValue.valueWithPoint(osPositionAttribute);
> 		}
> 		
>-		returnValue = NSValue.valueWithPoint(osPositionAttribute);
> 		return returnValue;
> 	}
> 	
> 	id getSizeAttribute (int childID) {
>+		id returnValue = null;
> 		AccessibleControlEvent event = new AccessibleControlEvent(this);
> 		event.childID = childID;
> 		event.width = -1;
>@@ -937,13 +933,10 @@
> 		if (event.width != -1) {
> 			controlSize.width = event.width;
> 			controlSize.height = event.height;
>-		} else {
>-			Rectangle bounds = control.getBounds();
>-			controlSize.width = bounds.width;
>-			controlSize.height = bounds.height;
>+			returnValue = NSValue.valueWithSize(controlSize);
> 		}
> 		
>-		return NSValue.valueWithSize(controlSize);
>+		return returnValue;
> 	}
> 	
> 	id getDescriptionAttribute (int childID) {

Actions: View | Diff

Attachments on bug 251084: 115312