Renamed some stuff

This commit is contained in:
2012-10-17 11:54:48 +02:00
parent c7a1317a32
commit 8e1f18d233
4 changed files with 6 additions and 8 deletions
+1 -1
View File
@@ -105,7 +105,7 @@ namespace DepthsBelow
TestMonster.X = 12; TestMonster.X = 12;
TestMonster.Y = 4; TestMonster.Y = 4;
//frame.Add(text); //frame.AddChild(text);
} }
/// <summary> /// <summary>
+4 -3
View File
@@ -10,6 +10,7 @@ namespace DepthsBelow.GUI
{ {
public class Frame public class Frame
{ {
public string Name;
public int Width public int Width
{ {
get { return this.Rectangle.Width; } get { return this.Rectangle.Width; }
@@ -66,14 +67,14 @@ namespace DepthsBelow.GUI
this.Parent = parentFrame; this.Parent = parentFrame;
} }
public void Add(Frame childFrame) public void AddChild(Frame childFrame)
{ {
childFrame.Parent = this; childFrame.Parent = this;
if (!Children.Contains(childFrame)) if (!Children.Contains(childFrame))
Children.Add(childFrame); Children.Add(childFrame);
} }
public void Remove(Frame childFrame) public void RemoveChild(Frame childFrame)
{ {
if (Children.Contains(childFrame)) if (Children.Contains(childFrame))
Children.Remove(childFrame); Children.Remove(childFrame);
@@ -82,7 +83,7 @@ namespace DepthsBelow.GUI
public void Destroy() public void Destroy()
{ {
if (Parent != null) if (Parent != null)
Parent.Remove(this); Parent.RemoveChild(this);
GUIManager.Remove(this); GUIManager.Remove(this);
} }
-4
View File
@@ -70,10 +70,6 @@ namespace DepthsBelow
tooltip.Y = ms.Y + 15; tooltip.Y = ms.Y + 15;
} }
} }
else
{
throw new Exception("Tooltip is null D:");
}
if (core.PlayerTurn == true) if (core.PlayerTurn == true)
{ {
@@ -3,3 +3,4 @@ ToolTip = CreateFrame("Frame")
local text = CreateFrame("Text", ToolTip) local text = CreateFrame("Text", ToolTip)
text:SetFont("Arial") text:SetFont("Arial")
text.Value = "99%" text.Value = "99%"
ToolTip.Text = text