Skip to content

Do not merge #2042

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Do not merge #2042

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 25 additions & 13 deletions bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DropTarget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
package org.eclipse.swt.dnd;

import org.eclipse.swt.*;
import org.eclipse.swt.graphics.*;
import org.eclipse.swt.internal.*;
import org.eclipse.swt.internal.ole.win32.*;
import org.eclipse.swt.internal.win32.*;
Expand Down Expand Up @@ -281,16 +282,14 @@ int DragEnter_64(long pDataObject, int grfKeyState, long pt, long pdwEffect) {
}

int DragEnter(long pDataObject, int grfKeyState, int pt_x, int pt_y, long pdwEffect) {
int zoom = DPIUtil.getZoomForAutoscaleProperty(nativeZoom);
pt_x = DPIUtil.scaleDown(pt_x, zoom);// To Points
pt_y = DPIUtil.scaleDown(pt_y, zoom);// To Points
Point location = convertPixelToPoint(pt_x, pt_y);
selectedDataType = null;
selectedOperation = DND.DROP_NONE;
if (iDataObject != null) iDataObject.Release();
iDataObject = null;

DNDEvent event = new DNDEvent();
if (!setEventData(event, pDataObject, grfKeyState, pt_x, pt_y, pdwEffect)) {
if (!setEventData(event, pDataObject, grfKeyState, location.x, location.y, pdwEffect)) {
OS.MoveMemory(pdwEffect, new int[] {COM.DROPEFFECT_NONE}, 4);
return COM.S_FALSE;
}
Expand Down Expand Up @@ -349,14 +348,12 @@ int DragOver_64(int grfKeyState, long pt, long pdwEffect) {
}

int DragOver(int grfKeyState, int pt_x, int pt_y, long pdwEffect) {
int zoom = DPIUtil.getZoomForAutoscaleProperty(nativeZoom);
pt_x = DPIUtil.scaleDown(pt_x, zoom);// To Points
pt_y = DPIUtil.scaleDown(pt_y, zoom);// To Points
Point location = convertPixelToPoint(pt_x, pt_y);
if (iDataObject == null) return COM.S_FALSE;
int oldKeyOperation = keyOperation;

DNDEvent event = new DNDEvent();
if (!setEventData(event, iDataObject.getAddress(), grfKeyState, pt_x, pt_y, pdwEffect)) {
if (!setEventData(event, iDataObject.getAddress(), grfKeyState, location.x, location.y, pdwEffect)) {
keyOperation = -1;
OS.MoveMemory(pdwEffect, new int[] {COM.DROPEFFECT_NONE}, 4);
return COM.S_FALSE;
Expand Down Expand Up @@ -403,23 +400,38 @@ int Drop_64(long pDataObject, int grfKeyState, long pt, long pdwEffect) {
return Drop(pDataObject, grfKeyState, point.x, point.y, pdwEffect);
}

private Point convertPixelToPoint(int xInPixels, int yInPixels) {
if (this.control == null) {
// If there is no control for context, the behavior remains as before
int zoom = DPIUtil.getZoomForAutoscaleProperty(this.nativeZoom);
return DPIUtil.scaleDown(new Point(xInPixels, yInPixels), zoom);
}
int zoom = DPIUtil.getZoomForAutoscaleProperty(this.control.nativeZoom);
// There is no API to convert absolute values in pixels to display relative
// points. Therefor, the display relative pixel values are converted to control
// relative pixel values via Windows API. These values can be scaled down to points
POINT pt = new POINT ();
pt.x = xInPixels; pt.y = yInPixels;
OS.ScreenToClient (this.control.handle, pt);
Point p = DPIUtil.scaleDown(new Point (pt.x, pt.y), zoom);
return this.control.toDisplay(p);
}

int Drop(long pDataObject, int grfKeyState, int pt_x, int pt_y, long pdwEffect) {
try {
int zoom = DPIUtil.getZoomForAutoscaleProperty(nativeZoom);
pt_x = DPIUtil.scaleDown(pt_x, zoom);// To Points
pt_y = DPIUtil.scaleDown(pt_y, zoom);// To Points
Point location = convertPixelToPoint(pt_x, pt_y);
DNDEvent event = new DNDEvent();
event.widget = this;
event.time = OS.GetMessageTime();
if (dropEffect != null) {
event.item = dropEffect.getItem(pt_x, pt_y);
event.item = dropEffect.getItem(location.x, location.y);
}
event.detail = DND.DROP_NONE;
notifyListeners(DND.DragLeave, event);
refresh();

event = new DNDEvent();
if (!setEventData(event, pDataObject, grfKeyState, pt_x, pt_y, pdwEffect)) {
if (!setEventData(event, pDataObject, grfKeyState, location.x, location.y, pdwEffect)) {
keyOperation = -1;
OS.MoveMemory(pdwEffect, new int[] {COM.DROPEFFECT_NONE}, 4);
return COM.S_FALSE;
Expand Down
Loading