Leahnaya/NHSE
1
0
Fork 0
mirror of https://github.com/kwsch/NHSE.git synced 2026-09-08 03:05:18 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Misc tweaks

Browse Source 
Fix bottom acre row labeling for MapAcre stuff
Don't close png dropdown on checkbox click
Don't change map reticle position on map right click (only left click)
This commit is contained in:
Kurt
2020-05-09 20:11:22 -07:00
parent 826ba00fcd
commit 000da2cbb6
2 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
NHSE.WinForms/Subforms/Map/FieldItemEditor.Designer.cs generated
View File

@@ -134,9 +134,9 @@ private void InitializeComponent()
this.RB_Item = new System.Windows.Forms.RadioButton();
this.RB_Terrain = new System.Windows.Forms.RadioButton();
this.L_TileMode = new System.Windows.Forms.Label();
this.ItemEdit = new NHSE.WinForms.ItemEditor();
this.Menu_SavePNGItems = new System.Windows.Forms.ToolStripMenuItem();
this.Menu_SavePNGTerrain = new System.Windows.Forms.ToolStripMenuItem();
this.ItemEdit = new NHSE.WinForms.ItemEditor();
this.CM_Click.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.PB_Map)).BeginInit();
this.CM_Picture.SuspendLayout();
@@ -301,12 +301,13 @@ private void InitializeComponent()
this.Menu_SavePNGItems,
this.Menu_SavePNGTerrain});
this.CM_Picture.Name = "CM_Picture";
this.CM_Picture.Size = new System.Drawing.Size(152, 70);
this.CM_Picture.Size = new System.Drawing.Size(181, 92);
this.CM_Picture.Closing += new System.Windows.Forms.ToolStripDropDownClosingEventHandler(this.CM_Picture_Closing);
//
// Menu_SavePNG
//
this.Menu_SavePNG.Name = "Menu_SavePNG";
this.Menu_SavePNG.Size = new System.Drawing.Size(180, 22);
this.Menu_SavePNG.Size = new System.Drawing.Size(151, 22);
this.Menu_SavePNG.Text = "Save .png";
this.Menu_SavePNG.Click += new System.EventHandler(this.Menu_SavePNG_Click);
//
@@ -1238,21 +1239,13 @@ private void InitializeComponent()
this.L_TileMode.Text = "Tile Editor Mode";
this.L_TileMode.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// ItemEdit
//
this.ItemEdit.Dock = System.Windows.Forms.DockStyle.Top;
this.ItemEdit.Location = new System.Drawing.Point(3, 3);
this.ItemEdit.Name = "ItemEdit";
this.ItemEdit.Size = new System.Drawing.Size(238, 390);
this.ItemEdit.TabIndex = 40;
//
// Menu_SavePNGItems
//
this.Menu_SavePNGItems.Checked = true;
this.Menu_SavePNGItems.CheckOnClick = true;
this.Menu_SavePNGItems.CheckState = System.Windows.Forms.CheckState.Checked;
this.Menu_SavePNGItems.Name = "Menu_SavePNGItems";
this.Menu_SavePNGItems.Size = new System.Drawing.Size(180, 22);
this.Menu_SavePNGItems.Size = new System.Drawing.Size(151, 22);
this.Menu_SavePNGItems.Text = "Include Items";
//
// Menu_SavePNGTerrain
@@ -1264,6 +1257,14 @@ private void InitializeComponent()
this.Menu_SavePNGTerrain.Size = new System.Drawing.Size(151, 22);
this.Menu_SavePNGTerrain.Text = "Include Terrain";
//
// ItemEdit
//
this.ItemEdit.Dock = System.Windows.Forms.DockStyle.Top;
this.ItemEdit.Location = new System.Drawing.Point(3, 3);
this.ItemEdit.Name = "ItemEdit";
this.ItemEdit.Size = new System.Drawing.Size(238, 390);
this.ItemEdit.TabIndex = 40;
//
// FieldItemEditor
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

17
NHSE.WinForms/Subforms/Map/FieldItemEditor.cs
View File

@@ -47,7 +47,7 @@ private void LoadComboBoxes()
foreach (var acre in MapGrid.Acres)
CB_Acre.Items.Add(acre.Name);
var exterior = AcreCoordinate.GetGridWithExterior(9, 7);
var exterior = AcreCoordinate.GetGridWithExterior(9, 8);
foreach (var acre in exterior)
CB_MapAcre.Items.Add(acre.Name);
@@ -447,6 +447,8 @@ private void Menu_SavePNG_Click(object sender, EventArgs e)
return;
}
CM_Picture.Close(ToolStripDropDownCloseReason.CloseCalled);
const string name = "map";
using var sfd = new SaveFileDialog
{
@@ -473,7 +475,18 @@ private void Menu_SavePNG_Click(object sender, EventArgs e)
}
}
private void PB_Map_MouseDown(object sender, MouseEventArgs e) => ClickMapAt(e, true);
private void CM_Picture_Closing(object sender, ToolStripDropDownClosingEventArgs e)
{
if (e.CloseReason == ToolStripDropDownCloseReason.ItemClicked && sender != Menu_SavePNG)
e.Cancel = true;
}
private void PB_Map_MouseDown(object sender, MouseEventArgs e)
{
if (e.Button != MouseButtons.Left)
return;
ClickMapAt(e, true);
}
private void ClickMapAt(MouseEventArgs e, bool skipLagCheck)
{