diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java index 005e314ef1..10a6c22077 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java @@ -4147,8 +4147,6 @@ void gtk4_motion_event(long controller, double x, double y, long event) { @Override long gtk_motion_notify_event (long widget, long event) { - int result; - double[] eventX = new double[1]; double[] eventY = new double[1]; GDK.gdk_event_get_coords(event, eventX, eventY); @@ -4160,13 +4158,11 @@ long gtk_motion_notify_event (long widget, long event) { // See comment in #dragDetect() if ((dragDetectionQueue != null) && OS.isWayland()) { boolean dragging = false; - if ((state & DRAG_DETECT) != 0 && wantDragDropDetection ()) { - boolean [] consume = new boolean [1]; - if (dragDetect ((int) eventX[0], (int) eventY[0], true, true, consume)) { - dragging = true; - if (consume [0]) result = 1; - if (isDisposed ()) return 1; - } else { + if ((state & DRAG_DETECT) != 0 && wantDragDropDetection()) { + boolean[] consume = new boolean[1]; + if (dragDetect((int)eventX[0], (int)eventY[0], true, true, consume)) { + dragging = true; + if (isDisposed()) return 1; } } if (dragging) { @@ -4186,7 +4182,7 @@ long gtk_motion_notify_event (long widget, long event) { GDK.gdk_event_get_state(event, eventState); } - if (sendDragEvent (eventButton[0], eventState[0], scaledEvent.x, scaledEvent.y, false)){ + if (sendDragEvent (eventButton[0], eventState[0], scaledEvent.x, scaledEvent.y, false)) { return 1; } } @@ -4239,8 +4235,8 @@ long gtk_motion_notify_event (long widget, long event) { } } - result = sendMouseEvent(SWT.MouseMove, 0, time, x, y, isHint, state[0]) ? 0 : 1; - return result; + return sendMouseEvent(SWT.MouseMove, 0, time, x, y, isHint, state[0]) + ? 0 : 1; } @Override