fix issue in prev with mapchooser. also, fix long-standing bug in mapchooser with double-drawing of cancel button
This commit is contained in:
@@ -281,9 +281,6 @@ namespace OpenRA
|
|||||||
DrawCentered("Choose Map", new int2(r.Left + w / 2, r.Top + 20), Color.White);
|
DrawCentered("Choose Map", new int2(r.Left + w / 2, r.Top + 20), Color.White);
|
||||||
rgbaRenderer.Flush();
|
rgbaRenderer.Flush();
|
||||||
|
|
||||||
DrawDialogBackground(new Rectangle(r.Right - 200 - 160 / 2,
|
|
||||||
r.Bottom - 50 + 6, 160, 24), "dialog2");
|
|
||||||
|
|
||||||
AddUiButton(new int2(r.Left + 200, r.Bottom - 40), "OK",
|
AddUiButton(new int2(r.Left + 200, r.Bottom - 40), "OK",
|
||||||
_ =>
|
_ =>
|
||||||
{
|
{
|
||||||
@@ -328,12 +325,14 @@ namespace OpenRA
|
|||||||
var map = kv.Value;
|
var map = kv.Value;
|
||||||
var itemRect = new Rectangle(r.Left + 50, y - 2, r.Width - 340, 20);
|
var itemRect = new Rectangle(r.Left + 50, y - 2, r.Width - 340, 20);
|
||||||
if (map == currentMap)
|
if (map == currentMap)
|
||||||
|
{
|
||||||
|
rgbaRenderer.Flush();
|
||||||
DrawDialogBackground(itemRect, "dialog2");
|
DrawDialogBackground(itemRect, "dialog2");
|
||||||
|
}
|
||||||
|
|
||||||
renderer.RegularFont.DrawText(rgbaRenderer, map.Title, new int2(r.Left + 60, y), Color.White);
|
renderer.RegularFont.DrawText(rgbaRenderer, map.Title, new int2(r.Left + 60, y), Color.White);
|
||||||
var closureMap = map;
|
var closureMap = map;
|
||||||
AddButton(itemRect, _ => { currentMap = closureMap; mapPreviewDirty = true; });
|
AddButton(itemRect, _ => { currentMap = closureMap; mapPreviewDirty = true; });
|
||||||
|
|
||||||
y += 20;
|
y += 20;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user