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

fix: correctly migrate style list

Browse source
This commit is contained in:
goat 2021-09-29 03:11:59 +02:00
parent 882a69b3d8
commit 4c4c8818a7
No known key found for this signature in database
GPG key ID: F18F057873895461
2 changed files with 72 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Dalamud/Interface/Internal/InterfaceManager.cs
View file

@ -343,11 +343,26 @@ namespace Dalamud.Interface.Internal
configuration.SavedStyles = new List<StyleModel> { StyleModel.DalamudStandard, StyleModel.DalamudClassic };
configuration.ChosenStyle = StyleModel.DalamudStandard.Name;
}
else if (configuration.SavedStyles.Count == 1)
{
configuration.SavedStyles.Add(StyleModel.DalamudClassic);
}
else if (configuration.SavedStyles[1].Name != StyleModel.DalamudClassic.Name)
{
configuration.SavedStyles.Insert(1, StyleModel.DalamudClassic);
}
configuration.SavedStyles[0] = StyleModel.DalamudStandard;
configuration.SavedStyles[1] = StyleModel.DalamudClassic;
var style = configuration.SavedStyles.FirstOrDefault(x => x.Name == configuration.ChosenStyle) ?? StyleModel.DalamudStandard;
var style = configuration.SavedStyles.FirstOrDefault(x => x.Name == configuration.ChosenStyle);
if (style == null)
{
style = StyleModel.DalamudStandard;
configuration.ChosenStyle = style.Name;
configuration.Save();
}
style.Apply();
ImGui.GetIO().FontGlobalScale = configuration.GlobalUiScale;

56
Dalamud/Interface/Internal/Windows/StyleEditor/StyleModel.cs
View file

@ -116,6 +116,20 @@ namespace Dalamud.Interface.Internal.Windows.StyleEditor
{ "NavWindowingDimBg", new Vector4(0.8f, 0.8f, 0.8f, 0.2f) },
{ "ModalWindowDimBg", new Vector4(0.8f, 0.8f, 0.8f, 0.35f) },
},
BuiltInColors = new DalamudColors
{
DalamudRed = new Vector4(1f, 0f, 0f, 1f),
DalamudGrey = new Vector4(0.7f, 0.7f, 0.7f, 1f),
DalamudGrey2 = new Vector4(0.7f, 0.7f, 0.7f, 1f),
DalamudGrey3 = new Vector4(0.5f, 0.5f, 0.5f, 1f),
DalamudWhite = new Vector4(1f, 1f, 1f, 1f),
DalamudWhite2 = new Vector4(0.878f, 0.878f, 0.878f, 1f),
DalamudOrange = new Vector4(1f, 0.709f, 0f, 1f),
TankBlue = new Vector4(0f, 0.6f, 1f, 1f),
HealerGreen = new Vector4(0f, 0.8f, 0.1333333f, 1f),
DPSRed = new Vector4(0.7058824f, 0f, 0f, 1f),
},
};
/// <summary>
@ -211,6 +225,20 @@ namespace Dalamud.Interface.Internal.Windows.StyleEditor
{ "NavWindowingDimBg", new Vector4(0.8f, 0.8f, 0.8f, 0.2f) },
{ "ModalWindowDimBg", new Vector4(0.8f, 0.8f, 0.8f, 0.35f) },
},
BuiltInColors = new DalamudColors
{
DalamudRed = new Vector4(1f, 0f, 0f, 1f),
DalamudGrey = new Vector4(0.7f, 0.7f, 0.7f, 1f),
DalamudGrey2 = new Vector4(0.7f, 0.7f, 0.7f, 1f),
DalamudGrey3 = new Vector4(0.5f, 0.5f, 0.5f, 1f),
DalamudWhite = new Vector4(1f, 1f, 1f, 1f),
DalamudWhite2 = new Vector4(0.878f, 0.878f, 0.878f, 1f),
DalamudOrange = new Vector4(1f, 0.709f, 0f, 1f),
TankBlue = new Vector4(0f, 0.6f, 1f, 1f),
HealerGreen = new Vector4(0f, 0.8f, 0.1333333f, 1f),
DPSRed = new Vector4(0.7058824f, 0f, 0f, 1f),
},
};
#pragma warning disable SA1600
@ -362,6 +390,20 @@ namespace Dalamud.Interface.Internal.Windows.StyleEditor
model.Colors[imGuiCol.ToString()] = style.Colors[(int)imGuiCol];
}
model.BuiltInColors = new DalamudColors
{
DalamudRed = ImGuiColors.DalamudRed,
DalamudGrey = ImGuiColors.DalamudGrey,
DalamudGrey2 = ImGuiColors.DalamudGrey2,
DalamudGrey3 = ImGuiColors.DalamudGrey3,
DalamudWhite = ImGuiColors.DalamudWhite,
DalamudWhite2 = ImGuiColors.DalamudWhite2,
DalamudOrange = ImGuiColors.DalamudOrange,
TankBlue = ImGuiColors.TankBlue,
HealerGreen = ImGuiColors.HealerGreen,
DPSRed = ImGuiColors.DPSRed,
};
return model;
}
@ -426,6 +468,20 @@ namespace Dalamud.Interface.Internal.Windows.StyleEditor
style.Colors[(int)imGuiCol] = this.Colors[imGuiCol.ToString()];
}
if (this.BuiltInColors != null)
{
ImGuiColors.DalamudRed = this.BuiltInColors.DalamudRed;
ImGuiColors.DalamudGrey = this.BuiltInColors.DalamudGrey;
ImGuiColors.DalamudGrey2 = this.BuiltInColors.DalamudGrey2;
ImGuiColors.DalamudGrey3 = this.BuiltInColors.DalamudGrey3;
ImGuiColors.DalamudWhite = this.BuiltInColors.DalamudWhite;
ImGuiColors.DalamudWhite2 = this.BuiltInColors.DalamudWhite2;
ImGuiColors.DalamudOrange = this.BuiltInColors.DalamudOrange;
ImGuiColors.TankBlue = this.BuiltInColors.TankBlue;
ImGuiColors.HealerGreen = this.BuiltInColors.HealerGreen;
ImGuiColors.DPSRed = this.BuiltInColors.DPSRed;
}
}
#pragma warning disable SA1600