|
@@ -6,7 +6,6 @@ package com.jme3.gde.gui.multiview;
|
|
|
|
|
|
import de.lessvoid.nifty.NiftyInputConsumer;
|
|
import de.lessvoid.nifty.NiftyInputConsumer;
|
|
import de.lessvoid.nifty.input.keyboard.KeyboardInputEvent;
|
|
import de.lessvoid.nifty.input.keyboard.KeyboardInputEvent;
|
|
-import de.lessvoid.nifty.input.mouse.MouseInputEvent;
|
|
|
|
import java.util.Iterator;
|
|
import java.util.Iterator;
|
|
import java.util.LinkedList;
|
|
import java.util.LinkedList;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
@@ -23,7 +22,7 @@ public class NiftyPreviewInputHandler implements de.lessvoid.nifty.spi.input.Inp
|
|
public synchronized void forwardEvents(NiftyInputConsumer nic) {
|
|
public synchronized void forwardEvents(NiftyInputConsumer nic) {
|
|
for (Iterator<MouseInputEvent> it = mouseEvents.iterator(); it.hasNext();) {
|
|
for (Iterator<MouseInputEvent> it = mouseEvents.iterator(); it.hasNext();) {
|
|
MouseInputEvent mouseInputEvent = it.next();
|
|
MouseInputEvent mouseInputEvent = it.next();
|
|
- nic.processMouseEvent(mouseInputEvent);
|
|
|
|
|
|
+ nic.processMouseEvent(mouseInputEvent.x, mouseInputEvent.y, mouseInputEvent.button, mouseInputEvent.huh, mouseInputEvent.pressed);
|
|
it.remove();
|
|
it.remove();
|
|
}
|
|
}
|
|
for (Iterator<KeyboardInputEvent> it = keyEvents.iterator(); it.hasNext();) {
|
|
for (Iterator<KeyboardInputEvent> it = keyEvents.iterator(); it.hasNext();) {
|
|
@@ -34,9 +33,10 @@ public class NiftyPreviewInputHandler implements de.lessvoid.nifty.spi.input.Inp
|
|
}
|
|
}
|
|
|
|
|
|
public synchronized void addMouseEvent(int newMouseX, int newMouseY, boolean mouseDown) {
|
|
public synchronized void addMouseEvent(int newMouseX, int newMouseY, boolean mouseDown) {
|
|
- MouseInputEvent event = new MouseInputEvent(newMouseX, newMouseY, mouseDown);
|
|
|
|
|
|
+ MouseInputEvent event = new MouseInputEvent(newMouseX, newMouseY, 0, 0, mouseDown);
|
|
mouseEvents.add(event);
|
|
mouseEvents.add(event);
|
|
}
|
|
}
|
|
|
|
+
|
|
public synchronized void addKeyEvent(int newKey, char newCharacter, boolean newKeyDown, boolean newShiftDown, boolean newControlDown) {
|
|
public synchronized void addKeyEvent(int newKey, char newCharacter, boolean newKeyDown, boolean newShiftDown, boolean newControlDown) {
|
|
KeyboardInputEvent event = new KeyboardInputEvent(newKey, newCharacter, newKeyDown, newShiftDown, newControlDown);
|
|
KeyboardInputEvent event = new KeyboardInputEvent(newKey, newCharacter, newKeyDown, newShiftDown, newControlDown);
|
|
keyEvents.add(event);
|
|
keyEvents.add(event);
|