floater window changes

This commit is contained in:
katzsmile
2010-09-16 00:34:43 +04:00
committed by Paul Chote
parent ad00193a17
commit 2ae6983bc2
2 changed files with 49 additions and 49 deletions

View File

@@ -43,7 +43,6 @@ namespace OpenRA.Editor
}
void MakeDirty() { dirty = true; }
string loadedMapName;
string currentMod = "ra";
TileSet tileset;
@@ -51,7 +50,7 @@ namespace OpenRA.Editor
void LoadMap(string mapname)
{
tilePalette.Controls.Clear();
tilePalette.Controls.Clear();
actorPalette.Controls.Clear();
resourcePalette.Controls.Clear();
@@ -94,13 +93,12 @@ namespace OpenRA.Editor
tileset = Rules.TileSets[map.Theater];
tileset.LoadTiles();
var palette = new Palette(FileSystem.Open(tileset.Palette), true);
surface1.Bind(map, tileset, palette);
// construct the palette of tiles
var palettes = new[] { tilePalette, actorPalette, resourcePalette };
var palettes = new[] { tilePalette, actorPalette, resourcePalette };
foreach (var p in palettes) { p.Visible = false; p.SuspendLayout(); }
foreach (var t in tileset.Templates)
{
try
@@ -119,7 +117,6 @@ namespace OpenRA.Editor
var template = t.Value;
tilePalette.Controls.Add(ibox);
tt.SetToolTip(ibox,
"{1}:{0} ({2}x{3})".F(
template.Image,
@@ -148,6 +145,7 @@ namespace OpenRA.Editor
BorderStyle = BorderStyle.FixedSingle
};
ibox.Click += (_, e) => surface1.SetActor(template);
actorPalette.Controls.Add(ibox);
@@ -178,6 +176,8 @@ namespace OpenRA.Editor
SizeMode = PictureBoxSizeMode.StretchImage
};
ibox.Click += (_, e) => surface1.SetResource(template);
resourcePalette.Controls.Add(ibox);
@@ -523,10 +523,8 @@ namespace OpenRA.Editor
private void layersFloaterToolStripMenuItem_Click(object sender, EventArgs e)
{
using (var npb = new PaletteBox())
{
npb.Show();
}
var pb = new PaletteBox();
pb.Show();
}
}
}