Fix inaccessible buttons

This commit is contained in:
Flamefire committed 2014-11-27 23:03:04 +01:00
1 parent 26484ad137
commit b99f9467de
3 files changed
+25 -5

No files matched your search

+1 -1
View File
@@ -86,7 +86,7 @@ namespace VocaluxeLib.Menu
public bool Selectable public bool Selectable
{ {
get { return _Selectable; } get { return _Selectable && Visible; }
set set
{ {
_Selectable = value; _Selectable = value;
+14 -4
View File
@@ -109,6 +109,12 @@ namespace VocaluxeLib.Menu
private CStatic _PlayerSelector; private CStatic _PlayerSelector;
private SRectF _Rect;
public override SRectF Rect
{
get { return _Rect; }
}
public bool Selectable public bool Selectable
{ {
get { return Visible; } get { return Visible; }
@@ -489,15 +495,19 @@ namespace VocaluxeLib.Menu
{ {
for (int j = 0; j < _Theme.Tiles.NumW; j++) for (int j = 0; j < _Theme.Tiles.NumW; j++)
{ {
var rect = new SRectF(Rect.X + j * (_Theme.Tiles.W + _Theme.Tiles.SpaceW), Rect.Y + i * (_Theme.Tiles.H + _Theme.Tiles.SpaceH), _Theme.Tiles.W, _Theme.Tiles.H, var rect = new SRectF(MaxRect.X + j * (_Theme.Tiles.W + _Theme.Tiles.SpaceW), MaxRect.Y + i * (_Theme.Tiles.H + _Theme.Tiles.SpaceH),
Rect.Z); _Theme.Tiles.W, _Theme.Tiles.H, MaxRect.Z);
var tileStatic = new CStatic(_PartyModeID, _TextureEmptyTile, _ColorEmptyTile, rect) {Aspect = EAspect.Crop}; var tileStatic = new CStatic(_PartyModeID, _TextureEmptyTile, _ColorEmptyTile, rect) {Aspect = EAspect.Crop};
var tileText = new CText(rect.X + rect.W / 2, rect.Y + rect.H + _Theme.Tiles.Name.Space, rect.Z, _Theme.Tiles.Name.Height, rect.W, EAlignment.Center, var tileText = new CText(rect.X + rect.W / 2, rect.Y + rect.H + _Theme.Tiles.Name.Space, rect.Z, _Theme.Tiles.Name.Height, rect.W, EAlignment.Center,
_Theme.Tiles.Name.Style, _Theme.Tiles.Name.Style, _Theme.Tiles.Name.Font, _ColorNameTile, "");
_Theme.Tiles.Name.Font, _ColorNameTile, "");
_Tiles.Add(new CTile(tileStatic, tileText, -1)); _Tiles.Add(new CTile(tileStatic, tileText, -1));
} }
} }
_Rect.X = MaxRect.X;
_Rect.Y = MaxRect.Y;
_Rect.Right = _Tiles[_Tiles.Count - 1].Avatar.Rect.Right;
_Rect.Bottom = _Tiles[_Tiles.Count - 1].Name.Rect.Bottom;
_Rect.Z = MaxRect.Z;
} }
private void _UpdateVisibleProfiles() private void _UpdateVisibleProfiles()
+10
View File
@@ -189,10 +189,20 @@ namespace VocaluxeLib
public float Right public float Right
{ {
get { return X + W; } get { return X + W; }
set
{
W = value - X;
Debug.Assert(W >= 0);
}
} }
public float Bottom public float Bottom
{ {
get { return Y + H; } get { return Y + H; }
set
{
H = value - Y;
Debug.Assert(H >= 0);
}
} }
public Size SizeI public Size SizeI
{ {