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

Merge branch 'master' of https://github.com/goaaats/Dalamud

Browse source
This commit is contained in:
goat 2020-05-22 14:05:04 +02:00
commit 72b416f35a
3 changed files with 32 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dalamud/Configuration/DalamudConfiguration.cs
View file

@ -28,6 +28,8 @@ namespace Dalamud
public Dictionary<int, PreferredRole> PreferredRoleReminders { get; set; } public Dictionary<int, PreferredRole> PreferredRoleReminders { get; set; }
public bool DutyFinderTaskbarFlash { get; set; } = true;
public string LanguageOverride { get; set; } public string LanguageOverride { get; set; }
public string LastVersion { get; set; } public string LastVersion { get; set; }

18
Dalamud/Game/Network/NetworkHandlers.cs
View file

@ -67,14 +67,16 @@ namespace Dalamud.Game.Network {
contentFinderCondition.Image = 112324; contentFinderCondition.Image = 112324;
} }
if (!NativeFunctions.ApplicationIsActivated()) { if (this.dalamud.Configuration.DutyFinderTaskbarFlash && !NativeFunctions.ApplicationIsActivated()) {
var flashInfo = new NativeFunctions.FLASHWINFO(); var flashInfo = new NativeFunctions.FLASHWINFO
flashInfo.cbSize = (uint)Marshal.SizeOf<NativeFunctions.FLASHWINFO>(); {
flashInfo.uCount = uint.MaxValue; cbSize = (uint)Marshal.SizeOf<NativeFunctions.FLASHWINFO>(),
flashInfo.dwTimeout = 0; uCount = uint.MaxValue,
flashInfo.dwFlags = NativeFunctions.FlashWindow.FLASHW_ALL | dwTimeout = 0,
NativeFunctions.FlashWindow.FLASHW_TIMERNOFG; dwFlags = NativeFunctions.FlashWindow.FLASHW_ALL |
flashInfo.hwnd = Process.GetCurrentProcess().MainWindowHandle; NativeFunctions.FlashWindow.FLASHW_TIMERNOFG,
hwnd = Process.GetCurrentProcess().MainWindowHandle
};
NativeFunctions.FlashWindowEx(ref flashInfo); NativeFunctions.FlashWindowEx(ref flashInfo);
} }

31
Dalamud/Interface/ItemSearchWindow.cs
View file

@ -120,7 +120,7 @@ namespace Dalamud.Interface
asyncEnum = asyncEnum.Where( asyncEnum = asyncEnum.Where(
x => (x.Name.ToLower().Contains(this.searchText.ToLower()) || x => (x.Name.ToLower().Contains(this.searchText.ToLower()) ||
int.TryParse(this.searchText, out var parsedId) && int.TryParse(this.searchText, out var parsedId) &&
parsedId == x.RowId)); parsedId == x.RowId) && x.Icon < 65000);
} }
if (this.currentKind != 0) if (this.currentKind != 0)
@ -161,11 +161,13 @@ namespace Dalamud.Interface
if (ImGui.IsMouseDoubleClicked(0)) if (ImGui.IsMouseDoubleClicked(0))
{ {
OnItemChosen?.Invoke(this, this.searchTask.Result[i]); if (this.selectedItemTex != null){
if (this.closeOnChoose) OnItemChosen?.Invoke(this, this.searchTask.Result[i]);
{ if (this.closeOnChoose)
this.selectedItemTex?.Dispose(); {
isOpen = false; this.selectedItemTex?.Dispose();
isOpen = false;
}
} }
} }
} }
@ -189,14 +191,16 @@ namespace Dalamud.Interface
ImGui.EndChild(); ImGui.EndChild();
// Darken choose button if it shouldn't be clickable // Darken choose button if it shouldn't be clickable
ImGui.PushStyleVar(ImGuiStyleVar.Alpha, this.selectedItemIndex < 0 ? 0.25f : 1); ImGui.PushStyleVar(ImGuiStyleVar.Alpha, this.selectedItemIndex < 0 || this.selectedItemTex == null ? 0.25f : 1);
if (ImGui.Button(Loc.Localize("Choose", "Choose"))) { if (ImGui.Button(Loc.Localize("Choose", "Choose"))) {
try { try {
OnItemChosen?.Invoke(this, this.searchTask.Result[this.selectedItemIndex]); if (this.selectedItemTex != null) {
if (this.closeOnChoose) { OnItemChosen?.Invoke(this, this.searchTask.Result[this.selectedItemIndex]);
this.selectedItemTex?.Dispose(); if (this.closeOnChoose) {
isOpen = false; this.selectedItemTex?.Dispose();
isOpen = false;
}
} }
} catch (Exception ex) { } catch (Exception ex) {
Log.Error($"Exception in Choose: {ex.Message}"); Log.Error($"Exception in Choose: {ex.Message}");
@ -214,6 +218,11 @@ namespace Dalamud.Interface
} }
} }
if (this.selectedItemIndex >= 0 && this.selectedItemTex == null) {
ImGui.SameLine();
ImGui.Text(Loc.Localize("DalamudItemNotLinkable", "This item is not linkable."));
}
ImGui.End(); ImGui.End();
return isOpen; return isOpen;