DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clickable and Draggable now also return booleans for whether they handled the event

Browse Source
This commit is contained in:
johni0702
2015-07-12 19:27:44 +02:00
parent bd21ed16ae
commit a9ded2bc1d
5 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiClickable.java
View File

@@ -42,7 +42,7 @@ public abstract class AbstractGuiClickable<T extends AbstractGuiClickable<T>> ex
} }
@Override @Override
public void mouseClick(ReadablePoint position, int button) { public boolean mouseClick(ReadablePoint position, int button) {
Point pos = new Point(position); Point pos = new Point(position);
if (getContainer() != null) { if (getContainer() != null) {
getContainer().convertFor(this, pos); getContainer().convertFor(this, pos);
@@ -50,7 +50,9 @@ public abstract class AbstractGuiClickable<T extends AbstractGuiClickable<T>> ex
if (isMouseHovering(pos) && isEnabled()) { if (isMouseHovering(pos) && isEnabled()) {
onClick(); onClick();
return true;
} }
return false;
} }
protected boolean isMouseHovering(ReadablePoint pos) { protected boolean isMouseHovering(ReadablePoint pos) {

3
src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiTextField.java
View File

@@ -92,8 +92,9 @@ public abstract class AbstractGuiTextField<T extends AbstractGuiTextField<T>>
} }
@Override @Override
public void mouseClick(ReadablePoint position, int button) { public boolean mouseClick(ReadablePoint position, int button) {
wrapped.mouseClicked(position.getX(), position.getY(), button); wrapped.mouseClicked(position.getX(), position.getY(), button);
return false;
} }
@Override @Override

3
src/main/java/de/johni0702/minecraft/gui/element/advanced/AbstractGuiTextArea.java
View File

@@ -394,7 +394,7 @@ public abstract class AbstractGuiTextArea<T extends AbstractGuiTextArea<T>>
} }
@Override @Override
public void mouseClick(ReadablePoint position, int button) { public boolean mouseClick(ReadablePoint position, int button) {
if (getContainer() != null) { if (getContainer() != null) {
getContainer().convertFor(this, (Point) (position = new Point(position))); getContainer().convertFor(this, (Point) (position = new Point(position)));
} }
@@ -414,6 +414,7 @@ public abstract class AbstractGuiTextArea<T extends AbstractGuiTextArea<T>>
} }
setFocused(hovering); setFocused(hovering);
return hovering;
} }
protected boolean isMouseHovering(ReadablePoint pos) { protected boolean isMouseHovering(ReadablePoint pos) {

2
src/main/java/de/johni0702/minecraft/gui/function/Clickable.java
View File

@@ -25,5 +25,5 @@ package de.johni0702.minecraft.gui.function;
import org.lwjgl.util.ReadablePoint; import org.lwjgl.util.ReadablePoint;
public interface Clickable { public interface Clickable {
void mouseClick(ReadablePoint position, int button); boolean mouseClick(ReadablePoint position, int button);
} }

4
src/main/java/de/johni0702/minecraft/gui/function/Draggable.java
View File

@@ -25,6 +25,6 @@ package de.johni0702.minecraft.gui.function;
import org.lwjgl.util.ReadablePoint; import org.lwjgl.util.ReadablePoint;
public interface Draggable extends Clickable { public interface Draggable extends Clickable {
void mouseDrag(ReadablePoint position, int button, long timeSinceLastCall); boolean mouseDrag(ReadablePoint position, int button, long timeSinceLastCall);
void mouseRelease(ReadablePoint position, int button); boolean mouseRelease(ReadablePoint position, int button);
} }