Cool_Tools/Switch-Toolbox
1
0
Fork 0
mirror of synced 2025-01-19 01:14:08 +01:00
Code Releases Wiki Activity

Some fixes to image editor with the zoom settings

Browse Source
This commit is contained in:
KillzXGaming 2019-05-08 18:17:11 -04:00
parent 1c92eec25c
commit fe7d2e2e60
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal
View File

Binary file not shown.

17
Switch_Toolbox_Library/Forms/Editors/ImageEditor/ImageEditorBase.cs
View File

@ -686,7 +686,7 @@ namespace Switch_Toolbox.Library.Forms
ArrayLevel = CurArrayDisplayLevel ArrayLevel = CurArrayDisplayLevel
}; };
pictureBoxCustom1.Image = new Bitmap(image); pictureBoxCustom1.Image = image;
TotalMipCount = ActiveTexture.MipCount - 1; TotalMipCount = ActiveTexture.MipCount - 1;
TotalArrayCount = ActiveTexture.ArrayCount - 1; TotalArrayCount = ActiveTexture.ArrayCount - 1;
@ -893,6 +893,9 @@ namespace Switch_Toolbox.Library.Forms
private void editBtn_Click(object sender, EventArgs e) private void editBtn_Click(object sender, EventArgs e)
{ {
if (!IsFinished)
return;
EditInExternalProgram(); EditInExternalProgram();
} }
@ -1029,11 +1032,17 @@ namespace Switch_Toolbox.Library.Forms
private void copyImageToolStripMenuItem_Click(object sender, EventArgs e) private void copyImageToolStripMenuItem_Click(object sender, EventArgs e)
{ {
if (!IsFinished)
return;
Clipboard.SetImage(pictureBoxCustom1.Image); Clipboard.SetImage(pictureBoxCustom1.Image);
} }
private void copyToolStripMenuItem_Click(object sender, EventArgs e) private void copyToolStripMenuItem_Click(object sender, EventArgs e)
{ {
if (!IsFinished)
return;
Clipboard.SetImage(pictureBoxCustom1.Image); Clipboard.SetImage(pictureBoxCustom1.Image);
} }
@ -1137,6 +1146,9 @@ namespace Switch_Toolbox.Library.Forms
private void SetZoomSetting() private void SetZoomSetting()
{ {
if (!IsFinished)
return;
if (Runtime.ImageEditor.EnableImageZoom) if (Runtime.ImageEditor.EnableImageZoom)
{ {
pictureBoxCustom1.AllowZoom = true; pictureBoxCustom1.AllowZoom = true;
@ -1163,6 +1175,9 @@ namespace Switch_Toolbox.Library.Forms
private void SetBottomBar() private void SetBottomBar()
{ {
if (!IsFinished)
return;
if (pictureBoxCustom1.Image != null) if (pictureBoxCustom1.Image != null)
{ {
if (Runtime.ImageEditor.EnableImageZoom) if (Runtime.ImageEditor.EnableImageZoom)

4
Switch_Toolbox_Library/Forms/Editors/Object Editor/ObjectEditorList.cs
View File

@ -182,7 +182,7 @@ namespace Switch_Toolbox.Library.Forms
listViewCustom1.BeginUpdate(); listViewCustom1.BeginUpdate();
listViewCustom1.Items.Clear(); listViewCustom1.Items.Clear();
/* if (treeViewCustom1.SelectedNode.Tag is IEnumerable<ArchiveFileInfo>) if (treeViewCustom1.SelectedNode.Tag is IEnumerable<ArchiveFileInfo>)
{ {
foreach (var file in (IEnumerable<ArchiveFileInfo>)treeViewCustom1.SelectedNode.Tag) foreach (var file in (IEnumerable<ArchiveFileInfo>)treeViewCustom1.SelectedNode.Tag)
{ {
@ -194,7 +194,7 @@ namespace Switch_Toolbox.Library.Forms
item.SubItems.Add(file.State.ToString()); item.SubItems.Add(file.State.ToString());
listViewCustom1.Items.Add(item); listViewCustom1.Items.Add(item);
} }
}*/ }
listViewCustom1.EndUpdate(); listViewCustom1.EndUpdate();
} }