Skip to content

Commit

Permalink
- [GUI] Added ToolTip to display.
Browse files Browse the repository at this point in the history
- [Core] Fix bug where some files would stuck in infinite loop.
  • Loading branch information
Razmoth committed Jan 28, 2024
1 parent e19d7b9 commit b64c915
Show file tree
Hide file tree
Showing 4 changed files with 63 additions and 7 deletions.
16 changes: 11 additions & 5 deletions AssetStudio.GUI/ExportOptions.Designer.cs

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

43 changes: 43 additions & 0 deletions AssetStudio.GUI/ExportOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Windows.Forms;

namespace AssetStudio.GUI
Expand Down Expand Up @@ -163,6 +164,48 @@ private void TexNameTextBox_LostFocus(object sender, EventArgs e)
}
}

private void TypesComboBox_MouseHover(object sender, EventArgs e)
{
var sb = new StringBuilder();
foreach (var type in types)
{
sb.Append($"{type.Key}: {(type.Value.Item1 ? '\x2713' : '\x2717')}, {(type.Value.Item2 ? '\x2713' : '\x2717')}\n");
}

toolTip.ToolTipTitle = "Type options status:";
toolTip.SetToolTip(typesComboBox, sb.ToString());
}

private void uvsComboBox_MouseHover(object sender, EventArgs e)
{
var sb = new StringBuilder();
foreach (var uv in uvs)
{
sb.Append($"{uv.Key}: {uvTypesComboBox.Items[uv.Value.Item2]}, {(uv.Value.Item1 ? '\x2713' : '\x2717')}\n");
}

toolTip.ToolTipTitle = "UVs options status:";
toolTip.SetToolTip(uvsComboBox, sb.ToString());
}

private void TexTypeComboBox_MouseHover(object sender, EventArgs e)
{
var sb = new StringBuilder();
foreach (var tex in texs)
{
sb.Append($"{texTypeComboBox.Items[tex.Key]}: {tex.Value}\n");
}

toolTip.ToolTipTitle = "Texture options status:";
toolTip.SetToolTip(texTypeComboBox, sb.ToString());
}

private void Key_MouseHover(object sender, EventArgs e)
{
toolTip.ToolTipTitle = "Value";
toolTip.SetToolTip(key, "Key in Hex");
}

private void Cancel_Click(object sender, EventArgs e)
{
DialogResult = DialogResult.Cancel;
Expand Down
7 changes: 5 additions & 2 deletions AssetStudio.GUI/ExportOptions.resx
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,14 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="exportUvsTooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="keyToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>162, 17</value>
</metadata>
<metadata name="exportUvsTooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
<metadata name="typesToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>272, 17</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>57</value>
Expand Down
4 changes: 4 additions & 0 deletions AssetStudio/OffsetStream.cs
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,10 @@ public IEnumerable<long> GetOffsets(string path)
{
Offset = AbsolutePosition;
yield return AbsolutePosition;
if (Offset == AbsolutePosition)
{
break;
}
}
}
}
Expand Down

0 comments on commit b64c915

Please sign in to comment.