diff options
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tracker.java')
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tracker.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tracker.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tracker.java index 6a2d14c908..127ce11cf0 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tracker.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tracker.java @@ -365,7 +365,7 @@ void drawRectangles (NSWindow window, Rectangle [] rects, boolean erase) { context.setCompositingOperation(erase ? OS.NSCompositeClear : OS.NSCompositeSourceOver); NSRect rectFrame = new NSRect(); NSPoint globalPoint = new NSPoint(); - float /*double*/ screenHeight = display.getPrimaryFrame().height; + double /*float*/ screenHeight = display.getPrimaryFrame().height; for (int i=0; i<rects.length; i++) { Rectangle rect = rects [i]; rectFrame.x = rect.x + parentOrigin.x; @@ -551,7 +551,7 @@ void mouse (NSEvent nsEvent) { void key (NSEvent nsEvent) { int nsType = (int)/*64*/nsEvent.type(); - int /*long*/ modifierFlags = nsEvent.modifierFlags(); + long /*int*/ modifierFlags = nsEvent.modifierFlags(); int nsKeyCode = nsEvent.keyCode(); int keyCode = Display.translateKey (nsKeyCode); @@ -755,14 +755,14 @@ public boolean open () { tracking = true; window = (NSWindow)new NSWindow().alloc(); NSArray screens = NSScreen.screens(); - float /*double*/ minX = Float.MAX_VALUE, maxX = Float.MIN_VALUE; - float /*double*/ minY = Float.MAX_VALUE, maxY = Float.MIN_VALUE; + double /*float*/ minX = Float.MAX_VALUE, maxX = Float.MIN_VALUE; + double /*float*/ minY = Float.MAX_VALUE, maxY = Float.MIN_VALUE; int count = (int)/*64*/screens.count(); for (int i = 0; i < count; i++) { NSScreen screen = new NSScreen(screens.objectAtIndex(i)); NSRect frame = screen.frame(); - float /*double*/ x1 = frame.x, x2 = frame.x + frame.width; - float /*double*/ y1 = frame.y, y2 = frame.y + frame.height; + double /*float*/ x1 = frame.x, x2 = frame.x + frame.width; + double /*float*/ y1 = frame.y, y2 = frame.y + frame.height; if (x1 < minX) minX = x1; if (x2 < minX) minX = x2; if (x1 > maxX) maxX = x1; |