Fixed GUIComponent rects blocking input in the sub editor + Added Windows preprocessor directives
This commit is contained in:
@@ -129,10 +129,41 @@ namespace Barotrauma
|
||||
{
|
||||
get { return new Vector2(rect.Center.X, rect.Center.Y); }
|
||||
}
|
||||
|
||||
|
||||
protected Rectangle ClampRect(Rectangle r)
|
||||
{
|
||||
if (parent == null) return r;
|
||||
Rectangle parentRect = parent.ClampRect(parent.rect);
|
||||
if (parentRect.Width <= 0 || parentRect.Height <= 0) return Rectangle.Empty;
|
||||
if (parentRect.X > r.X)
|
||||
{
|
||||
int diff = parentRect.X - r.X;
|
||||
r.X = parentRect.X;
|
||||
r.Width -= diff;
|
||||
}
|
||||
if (parentRect.Y > r.Y)
|
||||
{
|
||||
int diff = parentRect.Y - r.Y;
|
||||
r.Y = parentRect.Y;
|
||||
r.Height -= diff;
|
||||
}
|
||||
if (parentRect.X + parentRect.Width < r.X + r.Width)
|
||||
{
|
||||
int diff = (r.X + r.Width) - (parentRect.X + parentRect.Width);
|
||||
r.Width -= diff;
|
||||
}
|
||||
if (parentRect.Y + parentRect.Height < r.Y + r.Height)
|
||||
{
|
||||
int diff = (r.Y + r.Height) - (parentRect.Y + parentRect.Height);
|
||||
r.Height -= diff;
|
||||
}
|
||||
if (r.Width <= 0 || r.Height <= 0) return Rectangle.Empty;
|
||||
return r;
|
||||
}
|
||||
|
||||
public virtual Rectangle Rect
|
||||
{
|
||||
get { return rect; }
|
||||
get { return rect; }
|
||||
set
|
||||
{
|
||||
int prevX = rect.X, prevY = rect.Y;
|
||||
@@ -162,7 +193,7 @@ namespace Barotrauma
|
||||
|
||||
public virtual Rectangle MouseRect
|
||||
{
|
||||
get { return CanBeFocused ? rect : Rectangle.Empty; }
|
||||
get { return CanBeFocused ? ClampRect(rect) : Rectangle.Empty; }
|
||||
}
|
||||
|
||||
public Dictionary<ComponentState, List<UISprite>> sprites;
|
||||
|
||||
@@ -283,7 +283,7 @@ namespace Barotrauma
|
||||
{
|
||||
get
|
||||
{
|
||||
return rect;
|
||||
return ClampRect(rect);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -63,7 +63,7 @@ namespace Barotrauma
|
||||
|
||||
public override Rectangle MouseRect
|
||||
{
|
||||
get { return box.Rect; }
|
||||
get { return ClampRect(box.Rect); }
|
||||
}
|
||||
|
||||
public override ScalableFont Font
|
||||
|
||||
Reference in New Issue
Block a user