modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassSceneDnDEventHandler.java

Print this page

        

*** 44,59 **** this.scene = scene; } // Drop target handlers ! private double getPlatformScale() { View view = scene.getPlatformView(); if (view != null) { Window w = view.getWindow(); if (w != null) { ! return w.getPlatformScale(); } } return 1.0; } --- 44,70 ---- this.scene = scene; } // Drop target handlers ! private double getPlatformScaleX() { View view = scene.getPlatformView(); if (view != null) { Window w = view.getWindow(); if (w != null) { ! return w.getPlatformScaleX(); ! } ! } ! return 1.0; ! } ! ! private double getPlatformScaleY() { ! View view = scene.getPlatformView(); ! if (view != null) { ! Window w = view.getWindow(); ! if (w != null) { ! return w.getPlatformScaleY(); } } return 1.0; }
*** 62,75 **** final ClipboardAssistance dropTargetAssistant) { assert Platform.isFxApplicationThread(); return AccessController.doPrivileged((PrivilegedAction<TransferMode>) () -> { if (scene.dropTargetListener != null) { ! double pScale = getPlatformScale(); QuantumClipboard dragboard = QuantumClipboard.getDragboardInstance(dropTargetAssistant, false); ! return scene.dropTargetListener.dragEnter(x / pScale, y / pScale, xAbs / pScale, yAbs / pScale, recommendedTransferMode, dragboard); } return null; }, scene.getAccessControlContext()); } --- 73,87 ---- final ClipboardAssistance dropTargetAssistant) { assert Platform.isFxApplicationThread(); return AccessController.doPrivileged((PrivilegedAction<TransferMode>) () -> { if (scene.dropTargetListener != null) { ! double pScaleX = getPlatformScaleX(); ! double pScaleY = getPlatformScaleY(); QuantumClipboard dragboard = QuantumClipboard.getDragboardInstance(dropTargetAssistant, false); ! return scene.dropTargetListener.dragEnter(x / pScaleX, y / pScaleY, xAbs / pScaleX, yAbs / pScaleY, recommendedTransferMode, dragboard); } return null; }, scene.getAccessControlContext()); }
*** 89,100 **** final ClipboardAssistance dropTargetAssistant) { assert Platform.isFxApplicationThread(); return AccessController.doPrivileged((PrivilegedAction<TransferMode>) () -> { if (scene.dropTargetListener != null) { ! double pScale = getPlatformScale(); ! return scene.dropTargetListener.drop(x / pScale, y / pScale, xAbs / pScale, yAbs / pScale, recommendedTransferMode); } return null; }, scene.getAccessControlContext()); } --- 101,113 ---- final ClipboardAssistance dropTargetAssistant) { assert Platform.isFxApplicationThread(); return AccessController.doPrivileged((PrivilegedAction<TransferMode>) () -> { if (scene.dropTargetListener != null) { ! double pScaleX = getPlatformScaleX(); ! double pScaleY = getPlatformScaleY(); ! return scene.dropTargetListener.drop(x / pScaleX, y / pScaleY, xAbs / pScaleX, yAbs / pScaleY, recommendedTransferMode); } return null; }, scene.getAccessControlContext()); }
*** 104,115 **** final ClipboardAssistance dropTargetAssistant) { assert Platform.isFxApplicationThread(); return AccessController.doPrivileged((PrivilegedAction<TransferMode>) () -> { if (scene.dropTargetListener != null) { ! double pScale = getPlatformScale(); ! return scene.dropTargetListener.dragOver(x / pScale, y / pScale, xAbs / pScale, yAbs / pScale, recommendedTransferMode); } return null; }, scene.getAccessControlContext()); } --- 117,129 ---- final ClipboardAssistance dropTargetAssistant) { assert Platform.isFxApplicationThread(); return AccessController.doPrivileged((PrivilegedAction<TransferMode>) () -> { if (scene.dropTargetListener != null) { ! double pScaleX = getPlatformScaleX(); ! double pScaleY = getPlatformScaleY(); ! return scene.dropTargetListener.dragOver(x / pScaleX, y / pScaleY, xAbs / pScaleX, yAbs / pScaleY, recommendedTransferMode); } return null; }, scene.getAccessControlContext()); }
*** 124,138 **** final ClipboardAssistance dragSourceAssistant) { assert Platform.isFxApplicationThread(); AccessController.doPrivileged((PrivilegedAction<Void>) () -> { if (scene.dragGestureListener != null) { ! double pScale = getPlatformScale(); QuantumClipboard dragboard = QuantumClipboard.getDragboardInstance(dragSourceAssistant, true); scene.dragGestureListener.dragGestureRecognized( ! x / pScale, y / pScale, xAbs / pScale, yAbs / pScale, button, dragboard); } return null; }, scene.getAccessControlContext()); } --- 138,153 ---- final ClipboardAssistance dragSourceAssistant) { assert Platform.isFxApplicationThread(); AccessController.doPrivileged((PrivilegedAction<Void>) () -> { if (scene.dragGestureListener != null) { ! double pScaleX = getPlatformScaleX(); ! double pScaleY = getPlatformScaleY(); QuantumClipboard dragboard = QuantumClipboard.getDragboardInstance(dragSourceAssistant, true); scene.dragGestureListener.dragGestureRecognized( ! x / pScaleX, y / pScaleY, xAbs / pScaleX, yAbs / pScaleY, button, dragboard); } return null; }, scene.getAccessControlContext()); }