From 24efba751ddf7ec76c1df48dd352b5a5ff44599e Mon Sep 17 00:00:00 2001 From: Thomas Guimbretiere Date: Sat, 19 Oct 2013 15:38:51 +0200 Subject: [PATCH] Added a PictureMovable widget, that you can drag and drop around. Area of action is constrainted by the parent. Added getTop() getBottom() to IWidget interface (shortcuts for getPos().getY() and getPos().getY() + getSize().getY() ) --- mcp/mobius/waila/ConfigKeyHandler.java | 14 +++---- mcp/mobius/waila/gui/interfaces/IWidget.java | 2 + mcp/mobius/waila/gui/testing/ScreenTest.java | 5 ++- .../waila/gui/widgets/PictureDisplay.java | 2 +- .../waila/gui/widgets/PictureMovable.java | 39 +++++++++++++++++++ mcp/mobius/waila/gui/widgets/WidgetBase.java | 5 +++ 6 files changed, 57 insertions(+), 10 deletions(-) create mode 100644 mcp/mobius/waila/gui/widgets/PictureMovable.java diff --git a/mcp/mobius/waila/ConfigKeyHandler.java b/mcp/mobius/waila/ConfigKeyHandler.java index c4b7556..803898a 100644 --- a/mcp/mobius/waila/ConfigKeyHandler.java +++ b/mcp/mobius/waila/ConfigKeyHandler.java @@ -41,14 +41,14 @@ public class ConfigKeyHandler extends KeyHandler { new KeyBinding(Constants.BIND_WAILA_LIQUID, Keyboard.KEY_NUMPAD2), new KeyBinding(Constants.BIND_WAILA_RECIPE, Keyboard.KEY_NUMPAD3), new KeyBinding(Constants.BIND_WAILA_USAGE, Keyboard.KEY_NUMPAD4), - //new KeyBinding(Constants.BIND_WAILA_TESTING, Keyboard.KEY_NUMPAD9), + new KeyBinding(Constants.BIND_WAILA_TESTING, Keyboard.KEY_NUMPAD9), }, new boolean[]{ false, false, false, false, false, - //false + false }); LanguageRegistry.instance().addStringLocalization(Constants.BIND_WAILA_CFG, "[Waila] Config screen"); @@ -56,7 +56,7 @@ public class ConfigKeyHandler extends KeyHandler { LanguageRegistry.instance().addStringLocalization(Constants.BIND_WAILA_LIQUID, "[Waila] Show liquids"); LanguageRegistry.instance().addStringLocalization(Constants.BIND_WAILA_RECIPE, "[Waila] Show recipe"); LanguageRegistry.instance().addStringLocalization(Constants.BIND_WAILA_USAGE, "[Waila] Show usage"); - //LanguageRegistry.instance().addStringLocalization(Constants.BIND_WAILA_TESTING, "[Waila] Testing"); + LanguageRegistry.instance().addStringLocalization(Constants.BIND_WAILA_TESTING, "[Waila] Testing"); //LanguageRegistry.instance().addStringLocalization("key.wailatedump", "[Waila] Dump server TE"); } @@ -69,10 +69,10 @@ public class ConfigKeyHandler extends KeyHandler { mc.displayGuiScreen(new ScreenConfig(mc.currentScreen)); } - //if (kb.keyDescription == Constants.BIND_WAILA_TESTING){ - // if(mc.currentScreen == null) - // mc.displayGuiScreen(new ScreenConfig(mc.currentScreen)); - //} + if (kb.keyDescription == Constants.BIND_WAILA_TESTING){ + if(mc.currentScreen == null) + mc.displayGuiScreen(new ScreenTest(mc.currentScreen)); + } if (mc.currentScreen != null) return; diff --git a/mcp/mobius/waila/gui/interfaces/IWidget.java b/mcp/mobius/waila/gui/interfaces/IWidget.java index 71c66d3..aa57561 100644 --- a/mcp/mobius/waila/gui/interfaces/IWidget.java +++ b/mcp/mobius/waila/gui/interfaces/IWidget.java @@ -19,6 +19,8 @@ public interface IWidget { Point getSize(); int getRight(); int getLeft(); + int getTop(); + int getBottom(); void draw(); void draw(Point pos); diff --git a/mcp/mobius/waila/gui/testing/ScreenTest.java b/mcp/mobius/waila/gui/testing/ScreenTest.java index 83a0ae8..1f5064c 100644 --- a/mcp/mobius/waila/gui/testing/ScreenTest.java +++ b/mcp/mobius/waila/gui/testing/ScreenTest.java @@ -3,6 +3,7 @@ package mcp.mobius.waila.gui.testing; import mcp.mobius.waila.gui.screens.ScreenBase; import mcp.mobius.waila.gui.widgets.LabelFixedFont; import mcp.mobius.waila.gui.widgets.PictureDisplay; +import mcp.mobius.waila.gui.widgets.PictureMovable; import mcp.mobius.waila.gui.widgets.PictureSwitch; import mcp.mobius.waila.gui.widgets.WidgetGeometry; import mcp.mobius.waila.gui.widgets.buttons.ButtonBoolean; @@ -16,7 +17,7 @@ public class ScreenTest extends ScreenBase { public ScreenTest(GuiScreen parent) { super(parent); - this.getRoot().addWidget("Button", new ButtonScreenChange(this.getRoot(), "Next screen", new ScreenTest2(this))); - this.getRoot().getWidget("Button").setGeometry(new WidgetGeometry(50.0, 50.0, 100.0, 20.0, true, false, WidgetGeometry.Align.CENTER, WidgetGeometry.Align.CENTER)); + + this.getRoot().addWidget("Picture", new PictureMovable(this.getRoot(), "waila:textures/test.png")); } } diff --git a/mcp/mobius/waila/gui/widgets/PictureDisplay.java b/mcp/mobius/waila/gui/widgets/PictureDisplay.java index ce2a226..1fd5c9c 100644 --- a/mcp/mobius/waila/gui/widgets/PictureDisplay.java +++ b/mcp/mobius/waila/gui/widgets/PictureDisplay.java @@ -10,7 +10,7 @@ import org.lwjgl.util.Point; public class PictureDisplay extends WidgetBase { - private ResourceLocation texture; + protected ResourceLocation texture; public PictureDisplay(IWidget parent, String uri){ super(parent); diff --git a/mcp/mobius/waila/gui/widgets/PictureMovable.java b/mcp/mobius/waila/gui/widgets/PictureMovable.java new file mode 100644 index 0000000..0d67e8a --- /dev/null +++ b/mcp/mobius/waila/gui/widgets/PictureMovable.java @@ -0,0 +1,39 @@ +package mcp.mobius.waila.gui.widgets; + +import mcp.mobius.waila.gui.events.MouseEvent; +import mcp.mobius.waila.gui.interfaces.IWidget; + +import org.lwjgl.util.Point; + +public class PictureMovable extends PictureDisplay { + + private int offsetX, offsetY; + + public PictureMovable(IWidget parent, String uri) { + super(parent, uri); + } + + @Override + public void onMouseClick(MouseEvent event){ + this.offsetX = event.x - this.getPos().getX(); + this.offsetY = event.y - this.getPos().getY(); + } + + @Override + public void onMouseDrag(MouseEvent event){ + int newX = event.x - this.offsetX; + int newY = event.y - this.offsetY; + + newX = Math.max(newX, this.parent.getLeft()); + newY = Math.max(newY, this.parent.getTop()); + + if (newX + this.getSize().getX() > this.parent.getRight()) + newX = this.parent.getRight() - this.getSize().getX(); + + if (newY + this.getSize().getY() > this.parent.getBottom()) + newY = this.parent.getBottom() - this.getSize().getY(); + + this.setGeometry(new WidgetGeometry(newX, newY, this.getSize().getX(), this.getSize().getY(), + false, false, this.geom.fracSizeX, this.geom.fracSizeY, this.geom.alignX, this.geom.alignY)); + } +} diff --git a/mcp/mobius/waila/gui/widgets/WidgetBase.java b/mcp/mobius/waila/gui/widgets/WidgetBase.java index 4bff8bb..12e129e 100644 --- a/mcp/mobius/waila/gui/widgets/WidgetBase.java +++ b/mcp/mobius/waila/gui/widgets/WidgetBase.java @@ -118,6 +118,11 @@ public abstract class WidgetBase implements IWidget { public int getLeft() { return this.getPos().getX(); } @Override public int getRight() { return this.getPos().getX() + this.getSize().getX(); } + @Override + public int getTop() { return this.getPos().getY(); } + @Override + public int getBottom() { return this.getPos().getY() + this.getSize().getY(); } + //////////////////////////// // SOME RENDERING HELPERS //