Skip to content

Commit

Permalink
Fix Dumb Shit.
Browse files Browse the repository at this point in the history
  • Loading branch information
Ottermandias committed Mar 8, 2021
1 parent ec9e87e commit ea0d1c1
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 11 deletions.
4 changes: 2 additions & 2 deletions AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.4.0.0")]
[assembly: AssemblyFileVersion("1.4.0.0")]
[assembly: AssemblyVersion("1.4.1.0")]
[assembly: AssemblyFileVersion("1.4.1.0")]
2 changes: 1 addition & 1 deletion GatherBuddy.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"Name": "GatherBuddy",
"Description": "Adds commands to simplify gathering by finding nodes and their locations via item name and a UI to keep track of special node uptimes.",
"InternalName": "GatherBuddy",
"AssemblyVersion": "1.4.0.0",
"AssemblyVersion": "1.4.1.0",
"RepoUrl": "https://github.com/Ottermandias/GatherBuddy",
"ApplicableVersion": "any",
"DalamudApiLevel": 2
Expand Down
14 changes: 6 additions & 8 deletions Interface.cs
Original file line number Diff line number Diff line change
Expand Up @@ -330,9 +330,6 @@ private void DrawTimedTab(float space)

private static readonly string[] SoundNameList = Enum.GetNames(typeof(Sounds)).Where(S => S != "Unknown").ToArray();

private int nodeSelection = 0;
private string nodeFilter = "";

private void DrawDeleteAndEnable(float space)
{
ImGui.BeginGroup();
Expand Down Expand Up @@ -472,6 +469,8 @@ private void DrawHours(float space)

private bool focusComboFilter = false;


private string nodeFilter = "";
private void DrawNewAlarm(float space)
{
if (ImGui.Button(" + "))
Expand All @@ -484,7 +483,7 @@ private void DrawNewAlarm(float space)
ImGui.InputTextWithHint("##Name", "New Alarm Name", ref newAlarmName, 64);
ImGui.SameLine();
ImGui.SetNextItemWidth(-1);
if (ImGui.BeginCombo("##Node", AllTimedNodesNames[nodeSelection]))
if (ImGui.BeginCombo("##Node", AllTimedNodesNames[newAlertIdx]))
{
ImGui.SetNextItemWidth(-1);
ImGui.InputTextWithHint("##NodeFilter", "Filter", ref nodeFilter, 60);
Expand Down Expand Up @@ -515,17 +514,16 @@ private void DrawNewAlarm(float space)
{
++numNodes;
node = i;
if (ImGui.Selectable(AllTimedNodesNames[i], i == nodeSelection))
if (ImGui.Selectable(AllTimedNodesNames[i], i == newAlertIdx))
{
nodeSelection = i;

newAlertIdx = i;
ImGui.CloseCurrentPopup();
}
}
}
ImGui.EndChild();
if (!isFocused && numNodes <= 1) {
nodeSelection = node;
newAlertIdx = node;
ImGui.CloseCurrentPopup();
};

Expand Down

0 comments on commit ea0d1c1

Please sign in to comment.