diff --git a/src/net/bdew/lib/gui/test.sc b/src/net/bdew/lib/gui/test.sc deleted file mode 100644 index ec4b676..0000000 --- a/src/net/bdew/lib/gui/test.sc +++ /dev/null @@ -1,6 +0,0 @@ -import net.bdew.lib.gui._ - -val a = Rect(1, 1, 2, 2) - -a.contains(Point(1.5F, 1.5F)) - diff --git a/src/net/bdew/lib/gui/widgets/WidgetDynLabel.scala b/src/net/bdew/lib/gui/widgets/WidgetDynLabel.scala index 475a7b8..ff5cee1 100644 --- a/src/net/bdew/lib/gui/widgets/WidgetDynLabel.scala +++ b/src/net/bdew/lib/gui/widgets/WidgetDynLabel.scala @@ -9,11 +9,11 @@ package net.bdew.lib.gui.widgets -import net.bdew.lib.gui.{Point, Rect} +import net.bdew.lib.gui.{Color, Point, Rect} -class WidgetDynLabel(text: => String, x: Int, y: Int, color: Int) extends Widget { - val rect: Rect = new Rect(x, y, 0, 0) +class WidgetDynLabel(text: => String, x: Int, y: Int, color: Color) extends Widget { + val rect = new Rect(x, y, 0, 0) override def draw(mouse: Point) { - parent.getFontRenderer.drawString(text, x, y, color) + parent.drawText(text, rect.origin, color, false) } } diff --git a/src/net/bdew/lib/gui/widgets/WidgetLabel.scala b/src/net/bdew/lib/gui/widgets/WidgetLabel.scala index a05ac18..4d61021 100644 --- a/src/net/bdew/lib/gui/widgets/WidgetLabel.scala +++ b/src/net/bdew/lib/gui/widgets/WidgetLabel.scala @@ -9,11 +9,11 @@ package net.bdew.lib.gui.widgets -import net.bdew.lib.gui.{Point, Rect} +import net.bdew.lib.gui.{Color, Point, Rect} -class WidgetLabel(text: String, x: Int, y: Int, color: Int) extends Widget { - val rect: Rect = new Rect(x, y, 0, 0) +class WidgetLabel(text: String, x: Int, y: Int, color: Color) extends Widget { + val rect = new Rect(x, y, 0, 0) override def draw(mouse: Point) { - parent.getFontRenderer.drawString(text, x, y, color) + parent.drawText(text, rect.origin, color, false) } }