Skip to content

Commit

Permalink
Making palette editor smaller.
Browse files Browse the repository at this point in the history
  • Loading branch information
MainMemory committed Jul 12, 2015
1 parent de9873c commit 6e1ccd6
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 41 deletions.
32 changes: 16 additions & 16 deletions SonLVL/MainForm.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions SonLVL/MainForm.cs
Expand Up @@ -3785,18 +3785,18 @@ private void PalettePanel_Paint(object sender, PaintEventArgs e)
for (int y = 0; y <= 3; y++)
for (int x = 0; x <= 15; x++)
{
e.Graphics.FillRectangle(new SolidBrush(LevelData.PaletteToColor(y, x, false)), x * 32, y * 32, 32, 32);
e.Graphics.DrawRectangle(Pens.White, x * 32, y * 32, 31, 31);
e.Graphics.FillRectangle(new SolidBrush(LevelData.PaletteToColor(y, x, false)), x * 20, y * 20, 20, 20);
e.Graphics.DrawRectangle(Pens.White, x * 20, y * 20, 19, 19);
}
e.Graphics.DrawRectangle(new Pen(Color.Yellow, 2), SelectedColor.X * 32, SelectedColor.Y * 32, 32, 32);
e.Graphics.DrawRectangle(new Pen(Color.Yellow, 2), SelectedColor.X * 20, SelectedColor.Y * 20, 20, 20);
}

int[] cols;
private void PalettePanel_MouseDoubleClick(object sender, MouseEventArgs e)
{
if (!loaded) return;
int line = e.Y / 32;
int index = e.X / 32;
int line = e.Y / 20;
int index = e.X / 20;
SelectedColor = new Point(index, line);
ColorDialog a = new ColorDialog
{
Expand Down Expand Up @@ -3892,8 +3892,8 @@ void BlockCollision2_TextChanged(object sender, EventArgs e)
private void PalettePanel_MouseDown(object sender, MouseEventArgs e)
{
if (!loaded) return;
bool newpal = e.Y / 32 != SelectedColor.Y;
SelectedColor = new Point(e.X / 32, e.Y / 32);
bool newpal = e.Y / 20 != SelectedColor.Y;
SelectedColor = new Point(e.X / 20, e.Y / 20);
if (e.Button == System.Windows.Forms.MouseButtons.Right)
paletteContextMenuStrip.Show(PalettePanel, e.Location);
PalettePanel.Invalidate();
Expand Down
18 changes: 0 additions & 18 deletions SonLVL/MainForm.resx
Expand Up @@ -169,12 +169,6 @@
<metadata name="blockListToolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>287, 95</value>
</metadata>
<metadata name="blockListToolStrip.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="blockListToolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>287, 95</value>
</metadata>
<data name="remapBlocksButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
Expand All @@ -199,12 +193,6 @@
<metadata name="tileListToolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>435, 95</value>
</metadata>
<metadata name="tileListToolStrip.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="tileListToolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>435, 95</value>
</metadata>
<data name="remapTilesButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
Expand Down Expand Up @@ -286,9 +274,6 @@
<metadata name="objectContextMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>314, 17</value>
</metadata>
<metadata name="fgToolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>206, 56</value>
</metadata>
<metadata name="objectTypeImages.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>810, 56</value>
</metadata>
Expand Down Expand Up @@ -440,9 +425,6 @@
<metadata name="bgToolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>695, 56</value>
</metadata>
<metadata name="bgToolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>695, 56</value>
</metadata>
<data name="bgDrawToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
Expand Down

0 comments on commit 6e1ccd6

Please sign in to comment.