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 pull request #268 from Aireil/fix_general_chat_channel

Browse source 
Fix general chat channel combo
This commit is contained in:
goaaats 2021-03-31 01:57:20 +02:00 • committed by GitHub
commit 6169f28b33
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Dalamud/Interface/DalamudSettingsWindow.cs
View file

@ -18,8 +18,7 @@ namespace Dalamud.Interface
public DalamudSettingsWindow(Dalamud dalamud) {
this.dalamud = dalamud;
this.chatTypes = Enum.GetValues(typeof(XivChatType)).Cast<XivChatType>().Select(x => x.ToString()).ToArray();
this.dalamudMessagesChatType = (int) this.dalamud.Configuration.GeneralChatType;
this.dalamudMessagesChatType = this.dalamud.Configuration.GeneralChatType;
this.doCfTaskBarFlash = this.dalamud.Configuration.DutyFinderTaskbarFlash;
this.doCfChatMessage = this.dalamud.Configuration.DutyFinderChatMessage;
@ -74,11 +73,9 @@ namespace Dalamud.Interface
private string[] locLanguages;
private int langIndex;
private string[] chatTypes;
private Vector4 hintTextColor = new Vector4(0.70f, 0.70f, 0.70f, 1.00f);
private int dalamudMessagesChatType;
private XivChatType dalamudMessagesChatType;
private bool doCfTaskBarFlash;
private bool doCfChatMessage;
@ -126,8 +123,14 @@ namespace Dalamud.Interface
ImGui.Dummy(new Vector2(5f, 5f) * ImGui.GetIO().FontGlobalScale);
ImGui.Text(Loc.Localize("DalamudSettingsChannel", "General Chat Channel"));
ImGui.Combo("##XlChatTypeCombo", ref this.dalamudMessagesChatType, this.chatTypes,
this.chatTypes.Length);
if (ImGui.BeginCombo("##XlChatTypeCombo", this.dalamudMessagesChatType.ToString())) {
foreach (var type in Enum.GetValues(typeof(XivChatType)).Cast<XivChatType>()) {
if (ImGui.Selectable(type.ToString(), type == this.dalamudMessagesChatType)) {
this.dalamudMessagesChatType = type;
}
}
ImGui.EndCombo();
}
ImGui.TextColored(this.hintTextColor, Loc.Localize("DalamudSettingsChannelHint", "Select the chat channel that is to be used for general Dalamud messages."));
ImGui.Dummy(new Vector2(5f, 5f) * ImGui.GetIO().FontGlobalScale);
@ -318,7 +321,7 @@ namespace Dalamud.Interface
this.dalamud.LocalizationManager.SetupWithLangCode(this.languages[this.langIndex]);
this.dalamud.Configuration.LanguageOverride = this.languages[this.langIndex];
this.dalamud.Configuration.GeneralChatType = (XivChatType) this.dalamudMessagesChatType;
this.dalamud.Configuration.GeneralChatType = this.dalamudMessagesChatType;
this.dalamud.Configuration.DutyFinderTaskbarFlash = this.doCfTaskBarFlash;
this.dalamud.Configuration.DutyFinderChatMessage = this.doCfChatMessage;