ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2026-02-23 08:17:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Update some files for Luna.

Browse source
This commit is contained in:
Ottermandias 2025-10-19 22:24:52 +02:00
parent 3f48cd6910
commit a4302c9145
23 changed files with 1669 additions and 1712 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Penumbra/Import/TexToolsImporter.Gui.cs
View file

@ -1,4 +1,5 @@
using Dalamud.Bindings.ImGui;
using ImSharp;
using OtterGui;
using OtterGui.Raii;
using Penumbra.Import.Structs;
@ -89,12 +90,12 @@ public partial class TexToolsImporter
ImGui.TableNextColumn();
if (ex == null)
{
using var color = ImRaii.PushColor(ImGuiCol.Text, ColorId.FolderExpanded.Value());
using var color = ImGuiColor.Text.Push(ColorId.FolderExpanded.Value());
ImGui.TextUnformatted(dir?.FullName[(_baseDirectory.FullName.Length + 1)..] ?? "Unknown Directory");
}
else
{
using var color = ImRaii.PushColor(ImGuiCol.Text, ColorId.ConflictingMod.Value());
using var color = ImGuiColor.Text.Push(ColorId.ConflictingMod.Value());
ImGui.TextUnformatted(ex.Message);
ImGuiUtil.HoverTooltip(ex.ToString());
}

4
Penumbra/Import/Textures/TextureDrawer.cs
View file

@ -125,9 +125,9 @@ public static class TextureDrawer
{
var (path, game, isOnPlayer) = Items[globalIdx];
bool ret;
using (var color = ImRaii.PushColor(ImGuiCol.Text, ColorId.FolderExpanded.Value(), game))
using (var color = ImGuiColor.Text.Push(ColorId.FolderExpanded.Value(), game))
{
color.Push(ImGuiCol.Text, ColorId.HandledConflictMod.Value(), isOnPlayer);
color.Push(ImGuiColor.Text, ColorId.HandledConflictMod.Value(), isOnPlayer);
var equals = string.Equals(CurrentSelection.Path, path, StringComparison.OrdinalIgnoreCase);
var p = game ? $"--> {path}" : path[_skipPrefix..];
ret = ImGui.Selectable(p, selected) && !equals;