ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 10:17:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix window closing if there's an invalid repo URL added.

Browse source
This commit is contained in:
Eauldane 2025-11-30 20:11:39 +00:00
parent efa8f06dc7
commit b461ad845d
2 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Dalamud/Interface/Internal/Windows/Settings/SettingsWindow.cs
View file

@ -175,17 +175,21 @@ internal sealed class SettingsWindow : Window
{
if (buttonChild)
{
using var disabled = ImRaii.Disabled(this.tabs.Any(x => x.Entries.Any(y => !y.IsValid)));
using (ImRaii.PushStyle(ImGuiStyleVar.FrameRounding, 100f))
{
using var font = ImRaii.PushFont(InterfaceManager.IconFont);
var hasInvalidEntries = this.tabs.Any(x => x.Entries.Any(y => !y.IsValid));
using var disabled = ImRaii.Disabled(hasInvalidEntries);
if (ImGui.Button(FontAwesomeIcon.Save.ToIconString(), new Vector2(40)))
{
this.Save();
if (!ImGui.IsKeyDown(ImGuiKey.ModShift))
hasInvalidEntries = this.tabs.Any(x => x.Entries.Any(y => !y.IsValid));
if (!hasInvalidEntries && !ImGui.IsKeyDown(ImGuiKey.ModShift))
this.IsOpen = false;
}
}

17
Dalamud/Interface/Internal/Windows/Settings/Widgets/ThirdRepoSettingsEntry.cs
View file

@ -42,6 +42,7 @@ internal class ThirdRepoSettingsEntry : SettingsEntry
this.thirdRepoList =
[.. Service<DalamudConfiguration>.Get().ThirdRepoList.Select(x => x.Clone())];
this.thirdRepoListChanged = false;
this.IsValid = true;
}
public override void Save()
@ -50,9 +51,12 @@ internal class ThirdRepoSettingsEntry : SettingsEntry
var addedPendingRepo = this.TryAddTempRepo();
if (!addedPendingRepo && hasPendingRepo)
{
this.IsValid = false;
return;
}
this.IsValid = true;
Service<DalamudConfiguration>.Get().ThirdRepoList =
[.. this.thirdRepoList.Select(x => x.Clone())];
@ -179,6 +183,8 @@ internal class ThirdRepoSettingsEntry : SettingsEntry
var url = thirdRepoSetting.Url;
if (ImGui.InputText($"##thirdRepoInput", ref url, 65535, ImGuiInputTextFlags.EnterReturnsTrue))
{
this.IsValid = true;
var contains = this.thirdRepoList.Select(repo => repo.Url).Contains(url);
if (thirdRepoSetting.Url == url)
{
@ -196,8 +202,8 @@ internal class ThirdRepoSettingsEntry : SettingsEntry
}
else
{
this.thirdRepoListChanged = thirdRepoSetting.Url != url;
thirdRepoSetting.Url = url;
this.thirdRepoListChanged = url != thirdRepoSetting.Url;
}
}
@ -236,8 +242,10 @@ internal class ThirdRepoSettingsEntry : SettingsEntry
ImGui.Text(repoNumber.ToString());
ImGui.NextColumn();
ImGui.SetNextItemWidth(-1);
ImGui.InputText("##thirdRepoUrlInput"u8, ref this.thirdRepoTempUrl, 300);
ImGui.NextColumn();
if (ImGui.InputText("##thirdRepoUrlInput"u8, ref this.thirdRepoTempUrl, 300))
{
this.IsValid = true;
} ImGui.NextColumn();
// Enabled button
ImGui.NextColumn();
if (!string.IsNullOrEmpty(this.thirdRepoTempUrl) && ImGuiComponents.IconButton(FontAwesomeIcon.Plus))
@ -267,6 +275,7 @@ internal class ThirdRepoSettingsEntry : SettingsEntry
{
this.thirdRepoAddError = Loc.Localize("DalamudThirdRepoExists", "Repo already exists.");
Task.Delay(5000).ContinueWith(t => this.thirdRepoAddError = string.Empty);
this.IsValid = false;
return false;
}
@ -274,6 +283,7 @@ internal class ThirdRepoSettingsEntry : SettingsEntry
{
this.thirdRepoAddError = Loc.Localize("DalamudThirdRepoNotUrl", "The entered address is not a valid URL.\nDid you mean to enter it as a DevPlugin in the fields above instead?");
Task.Delay(5000).ContinueWith(t => this.thirdRepoAddError = string.Empty);
this.IsValid = false;
return false;
}
@ -284,6 +294,7 @@ internal class ThirdRepoSettingsEntry : SettingsEntry
});
this.thirdRepoListChanged = true;
this.thirdRepoTempUrl = string.Empty;
this.IsValid = true;
return true;
}