mirror of
https://github.com/GTNewHorizons/waila.git
synced 2026-11-20 20:22:28 +00:00
Added focus handling, more passthought and mouse dragging for VBar.
This commit is contained in:
1 parent
5360475686
commit
636ae4203e
5 files changed
+156
-23
No files matched your search
@@ -23,8 +23,12 @@ public class GuiBaseWailaScreen extends GuiScreen{
|
||||
/* Custom mouse handling */
|
||||
private int lastMouseButton = -1;
|
||||
private long lastMouseEvent = -1;
|
||||
private int lastMousePosX = -1;
|
||||
private int lastMousePosY = -1;
|
||||
private static int buttonCount = Mouse.getButtonCount();
|
||||
private boolean[] buttonStates = new boolean[buttonCount];
|
||||
private boolean[] lastButtonStates = new boolean[buttonCount];
|
||||
private IWidget[] focusWidget = new IWidget[buttonCount];
|
||||
private IWidget mainFocusWidget = null;
|
||||
|
||||
|
||||
|
||||
@@ -89,16 +93,29 @@ public class GuiBaseWailaScreen extends GuiScreen{
|
||||
public void mouseClicked(int mouseX, int mouseY, int buttonID)
|
||||
{
|
||||
IWidget widget = this.getWidgetAtCoordinates(mouseX, mouseY);
|
||||
if (widget == null || !widget.mouseClicked(mouseX, mouseY, buttonID))
|
||||
if (widget != null && widget.mouseClicked(mouseX, mouseY, buttonID)){
|
||||
if (buttonID == 0)
|
||||
this.mainFocusWidget = widget;
|
||||
this.focusWidget[buttonID] = widget;
|
||||
}
|
||||
else
|
||||
super.mouseClicked(mouseX, mouseY, buttonID);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void mouseMovedOrUp(int mouseX, int mouseY, int buttonID)
|
||||
{
|
||||
IWidget widget = this.getWidgetAtCoordinates(mouseX, mouseY);
|
||||
if (widget == null || !widget.mouseMovedOrUp(mouseX, mouseY, buttonID))
|
||||
super.mouseMovedOrUp(mouseX, mouseY, buttonID);
|
||||
if (buttonID == 0)
|
||||
this.mainFocusWidget = null;
|
||||
|
||||
if (this.focusWidget[buttonID] != null){
|
||||
this.focusWidget[buttonID].mouseReleased(mouseX, mouseY, buttonID);
|
||||
this.focusWidget[buttonID] = null;
|
||||
} else {
|
||||
IWidget widget = this.getWidgetAtCoordinates(mouseX, mouseY);
|
||||
if (widget == null || !widget.mouseReleased(mouseX, mouseY, buttonID))
|
||||
super.mouseMovedOrUp(mouseX, mouseY, buttonID);
|
||||
}
|
||||
}
|
||||
|
||||
public void mouseWheel(int mouseX, int mouseY, int mouseZ){
|
||||
@@ -109,14 +126,22 @@ public class GuiBaseWailaScreen extends GuiScreen{
|
||||
}
|
||||
|
||||
public void mouseMoved(int mouseX, int mouseY){
|
||||
IWidget widget = this.getWidgetAtCoordinates(mouseX, mouseY);
|
||||
if (widget != null)
|
||||
widget.mouseMoved(mouseX, mouseY);
|
||||
if (this.mainFocusWidget != null)
|
||||
this.mainFocusWidget.mouseMoved(mouseX, mouseY);
|
||||
else{
|
||||
IWidget widget = this.getWidgetAtCoordinates(mouseX, mouseY);
|
||||
if (widget != null)
|
||||
widget.mouseMoved(mouseX, mouseY);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
public void mouseDragged(int mouseX, int mouseY, int buttonID, long deltaTime){
|
||||
//System.out.printf("%s %s %s %s %s %s\n", mouseX, mouseY, buttonID, deltaTime);
|
||||
IWidget widget = this.getWidgetAtCoordinates(mouseX, mouseY);
|
||||
if (widget != null)
|
||||
widget.mouseDragged(mouseX, mouseY, buttonID, deltaTime);
|
||||
}
|
||||
*/
|
||||
|
||||
@Override
|
||||
public void handleMouseInput()
|
||||
@@ -124,6 +149,7 @@ public class GuiBaseWailaScreen extends GuiScreen{
|
||||
int mouseX = Mouse.getEventX() * this.width / this.mc.displayWidth;
|
||||
int mouseY = this.height - Mouse.getEventY() * this.height / this.mc.displayHeight - 1;
|
||||
int mouseZ = Mouse.getEventDWheel();
|
||||
boolean[] buttonChanged = new boolean[buttonCount];
|
||||
|
||||
if (mouseZ != 0)
|
||||
this.mouseWheel(mouseX, mouseY, mouseZ);
|
||||
@@ -134,9 +160,42 @@ public class GuiBaseWailaScreen extends GuiScreen{
|
||||
hasStateChanged = true;
|
||||
changedButton = Mouse.getEventButton();
|
||||
}
|
||||
for (int i = 0; i < this.buttonStates.length; i++)
|
||||
this.buttonStates[i] = Mouse.isButtonDown(i);
|
||||
for (int i = 0; i < buttonCount; i++){
|
||||
buttonChanged[i] = Mouse.isButtonDown(i) != this.lastButtonStates[i];
|
||||
this.lastButtonStates[i] = Mouse.isButtonDown(i);
|
||||
|
||||
if (buttonChanged[i] && Mouse.isButtonDown(i))
|
||||
this.mouseClicked(mouseX, mouseY, i);
|
||||
else if (buttonChanged[i] && !Mouse.isButtonDown(i))
|
||||
this.mouseMovedOrUp(mouseX, mouseY, i);
|
||||
}
|
||||
|
||||
if ((mouseX != this.lastMousePosX) || (mouseY != this.lastMousePosY)){
|
||||
this.mouseMoved(mouseX, mouseY);
|
||||
this.lastMousePosX = mouseX;
|
||||
this.lastMousePosY = mouseY;
|
||||
}
|
||||
|
||||
/*
|
||||
if (changedButton != -1){
|
||||
if (Mouse.isButtonDown(changedButton)){
|
||||
this.mouseClicked(mouseX, mouseY, changedButton);
|
||||
this.lastMouseButton = changedButton;
|
||||
}
|
||||
else if (!Mouse.isButtonDown(changedButton)){
|
||||
this.mouseMovedOrUp(mouseX, mouseY, changedButton);
|
||||
this.lastMouseButton = -1;
|
||||
}
|
||||
}
|
||||
|
||||
if ((mouseX != this.lastMousePosX) || (mouseY != this.lastMousePosY)){
|
||||
this.mouseMoved(mouseX, mouseY);
|
||||
this.lastMousePosX = mouseX;
|
||||
this.lastMousePosY = mouseY;
|
||||
}
|
||||
*/
|
||||
|
||||
/*
|
||||
if (hasStateChanged)
|
||||
{
|
||||
this.lastMouseButton = changedButton;
|
||||
@@ -148,13 +207,21 @@ public class GuiBaseWailaScreen extends GuiScreen{
|
||||
this.lastMouseButton = -1;
|
||||
this.mouseMovedOrUp(mouseX, mouseY, changedButton);
|
||||
}
|
||||
*/
|
||||
/*
|
||||
else if (this.lastMouseButton != -1 && this.lastMouseEvent > 0L)
|
||||
{
|
||||
long deltaTime = Minecraft.getSystemTime() - this.lastMouseEvent;
|
||||
this.mouseDragged(mouseX, mouseY, this.lastMouseButton, deltaTime);
|
||||
}
|
||||
else if (Mouse.getDX() != 0 || Mouse.getDY() != 0)
|
||||
*/
|
||||
/*
|
||||
else if ((mouseX != this.lastMousePosX) || (mouseY != this.lastMousePosY)){
|
||||
this.mouseMoved(mouseX, mouseY);
|
||||
this.lastMousePosX = mouseX;
|
||||
this.lastMousePosY = mouseY;
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
private IWidget getWidgetAtCoordinates(int posX, int posY){
|
||||
|
||||
@@ -3,6 +3,7 @@ package mcp.mobius.waila.gui.widget;
|
||||
import java.util.Collection;
|
||||
import java.util.HashMap;
|
||||
|
||||
import org.lwjgl.input.Mouse;
|
||||
import org.lwjgl.opengl.Display;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
@@ -21,6 +22,8 @@ public abstract class BaseWidget implements IWidget {
|
||||
protected FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer;;
|
||||
protected RenderEngine renderEngine = Minecraft.getMinecraft().renderEngine;
|
||||
protected HashMap<String, IWidget> widgets = new HashMap<String, IWidget>();
|
||||
protected IWidget[] focusWidget = new IWidget[Mouse.getButtonCount()];
|
||||
protected IWidget mainFocusWidget = null;
|
||||
|
||||
public BaseWidget(){}
|
||||
|
||||
@@ -62,17 +65,54 @@ public abstract class BaseWidget implements IWidget {
|
||||
@Override
|
||||
public boolean mouseClicked(int mouseX, int mouseY, int buttonID){
|
||||
IWidget widget = this.getWidgetAtCoordinates(mouseX, mouseY);
|
||||
if (widget != null)
|
||||
if (widget != null){
|
||||
if (buttonID == 0)
|
||||
this.mainFocusWidget = widget;
|
||||
this.focusWidget[buttonID] = widget;
|
||||
return widget.mouseClicked(mouseX, mouseY, buttonID);
|
||||
} else
|
||||
return false;
|
||||
}
|
||||
@Override
|
||||
public boolean mouseReleased(int mouseX, int mouseY, int buttonID){
|
||||
if (buttonID == 0)
|
||||
this.mainFocusWidget = null;
|
||||
|
||||
if (this.focusWidget[buttonID] != null){
|
||||
boolean retval = this.focusWidget[buttonID].mouseReleased(mouseX, mouseY, buttonID);
|
||||
this.focusWidget[buttonID] = null;
|
||||
return retval;
|
||||
}
|
||||
this.focusWidget[buttonID] = null;
|
||||
return false;
|
||||
}
|
||||
@Override
|
||||
public boolean mouseWheel(int mouseX, int mouseY, int mouseZ){
|
||||
IWidget widget = this.getWidgetAtCoordinates(mouseX, mouseY);
|
||||
if (widget != null)
|
||||
return widget.mouseWheel(mouseX, mouseY, mouseZ);
|
||||
return false;
|
||||
}
|
||||
@Override
|
||||
public boolean mouseMoved(int mouseX, int mouseY){
|
||||
if (this.mainFocusWidget != null)
|
||||
return this.mainFocusWidget.mouseMoved(mouseX, mouseY);
|
||||
|
||||
IWidget widget = this.getWidgetAtCoordinates(mouseX, mouseY);
|
||||
if (widget != null)
|
||||
return widget.mouseMoved(mouseX, mouseY);
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean mouseWheel(int mouseX, int mouseY, int mouseZ){return false;}
|
||||
@Override
|
||||
public boolean mouseMovedOrUp(int mouseX, int mouseY, int buttonID){return false;}
|
||||
@Override
|
||||
public boolean mouseMoved(int mouseX, int mouseY){return false;}
|
||||
/*
|
||||
@Override
|
||||
public boolean mouseDragged(int mouseX, int mouseY, int buttonID, long deltaTime){
|
||||
IWidget widget = this.getWidgetAtCoordinates(mouseX, mouseY);
|
||||
if (widget != null)
|
||||
return widget.mouseDragged(mouseX, mouseY, buttonID, deltaTime);
|
||||
return false;
|
||||
}
|
||||
*/
|
||||
|
||||
public void startScissorFilter(int posX, int posY, int width, int height){
|
||||
ScaledResolution res = new ScaledResolution(Minecraft.getMinecraft().gameSettings,
|
||||
|
||||
@@ -173,5 +173,5 @@ public class ContainerTable extends BaseWidget{
|
||||
public boolean mouseWheel(int mouseX, int mouseY, int mouseZ){
|
||||
this.scrollbar.addCurrentValue((mouseZ / -120) * this.scrollbar.getStep());
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -15,9 +15,10 @@ public interface IWidget {
|
||||
void setPos(int posX, int posY, int posZ);
|
||||
|
||||
boolean mouseClicked(int mouseX, int mouseY, int buttonID);
|
||||
boolean mouseWheel(int mouseX, int mouseY, int mouseZ);
|
||||
boolean mouseMovedOrUp(int mouseX, int mouseY, int buttonID);
|
||||
boolean mouseReleased(int mouseX, int mouseY, int buttonID);
|
||||
boolean mouseWheel(int mouseX, int mouseY, int mouseZ);
|
||||
boolean mouseMoved(int mouseX, int mouseY);
|
||||
//boolean mouseDragged(int mouseX, int mouseY, int buttonID, long deltaTime);
|
||||
|
||||
void draw();
|
||||
void draw(int x, int y, int z);
|
||||
|
||||
@@ -9,6 +9,7 @@ public class VerticalScrollBar extends BaseWidget {
|
||||
private int buttonH;
|
||||
private int buttonTop;
|
||||
private int step = 6;
|
||||
public boolean dragging = false;
|
||||
|
||||
public VerticalScrollBar(){};
|
||||
|
||||
@@ -53,6 +54,8 @@ public class VerticalScrollBar extends BaseWidget {
|
||||
|
||||
public void setCurrentValue(int currvalue){
|
||||
this.currvalue = currvalue;
|
||||
this.currvalue = Math.max(0, this.currvalue);
|
||||
this.currvalue = Math.min(this.maxvalue, this.currvalue);
|
||||
}
|
||||
|
||||
public void addCurrentValue(int value){
|
||||
@@ -75,9 +78,31 @@ public class VerticalScrollBar extends BaseWidget {
|
||||
this.addCurrentValue(-1 * this.step);
|
||||
else if (mouseY > this.buttonTop + this.buttonH)
|
||||
this.addCurrentValue(this.step);
|
||||
else if (buttonID == 0)
|
||||
this.dragging = true;
|
||||
else
|
||||
System.out.printf("Clicked on button\n");
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean mouseReleased(int mouseX, int mouseY, int buttonID){
|
||||
if (buttonID == 0)
|
||||
this.dragging = false;
|
||||
else
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public boolean mouseMoved(int mouseX, int mouseY){
|
||||
if (this.dragging){
|
||||
int value = (int)((float)((mouseY - this.buttonH/2) - this.posY)/(float)(this.getHeight()-this.buttonH)*(float)this.maxvalue);
|
||||
this.setCurrentValue(value);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user