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

Change all IPC Testers and all SameLines.
Some checks are pending
.NET Build / build (push) Waiting to run
Details

Browse source
This commit is contained in:
Ottermandias 2025-10-13 00:22:48 +02:00
parent 548b4a7cdc
commit 2d11a0ced8
78 changed files with 917 additions and 962 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Penumbra/Import/Textures/CombinedTexture.Manipulation.cs
View file

@ -1,9 +1,10 @@
using Dalamud.Bindings.ImGui;
using OtterGui.Raii;
using OtterGui;
using SixLabors.ImageSharp.PixelFormats;
using Dalamud.Interface.Utility;
using ImSharp;
using Penumbra.UI;
using Rgba32 = SixLabors.ImageSharp.PixelFormats.Rgba32;
namespace Penumbra.Import.Textures;
@ -237,7 +238,7 @@ public partial class CombinedTexture
ImGui.SetNextItemWidth(75.0f * UiHelpers.Scale);
ImGui.DragInt("##XOffset", ref _offsetX, 0.5f);
ret |= ImGui.IsItemDeactivatedAfterEdit();
ImGui.SameLine();
Im.Line.Same();
ImGui.SetNextItemWidth(75.0f * UiHelpers.Scale);
ImGui.DragInt("Offsets##YOffset", ref _offsetY, 0.5f);
ret |= ImGui.IsItemDeactivatedAfterEdit();
@ -273,7 +274,7 @@ public partial class CombinedTexture
ImGui.TextUnformatted("Copy");
foreach (var channel in Enum.GetValues<Channels>())
{
ImGui.SameLine();
Im.Line.Same();
var copy = (_copyChannels & channel) != 0;
if (ImGui.Checkbox(channel.ToString(), ref copy))
{
@ -352,28 +353,28 @@ public partial class CombinedTexture
private static bool DrawMatrixTools(ref Matrix4x4 multiplier, ref Vector4 constant)
{
var changes = PresetCombo(ref multiplier, ref constant);
ImGui.SameLine();
Im.Line.Same();
ImGui.Dummy(ImGuiHelpers.ScaledVector2(20, 0));
ImGui.SameLine();
Im.Line.Same();
ImGui.TextUnformatted("Invert");
ImGui.SameLine();
Im.Line.Same();
Channels channels = 0;
if (ImGui.Button("Colors"))
channels |= Channels.Red | Channels.Green | Channels.Blue;
ImGui.SameLine();
Im.Line.Same();
if (ImGui.Button("R"))
channels |= Channels.Red;
ImGui.SameLine();
Im.Line.Same();
if (ImGui.Button("G"))
channels |= Channels.Green;
ImGui.SameLine();
Im.Line.Same();
if (ImGui.Button("B"))
channels |= Channels.Blue;
ImGui.SameLine();
Im.Line.Same();
if (ImGui.Button("A"))
channels |= Channels.Alpha;

2
Penumbra/Import/Textures/CombinedTexture.cs
View file

@ -97,7 +97,7 @@ public partial class CombinedTexture : IDisposable
break;
case TextureType.Png:
SaveAsPng(textures, path);
break;
break;
case TextureType.Targa:
SaveAsTarga(textures, path);
break;

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

@ -1,5 +1,6 @@
using Dalamud.Bindings.ImGui;
using Dalamud.Interface;
using ImSharp;
using Lumina.Data.Files;
using OtterGui;
using OtterGui.Raii;
@ -9,6 +10,7 @@ using Penumbra.Mods.Editor;
using Penumbra.String.Classes;
using Penumbra.UI;
using Penumbra.UI.Classes;
using MouseWheelType = OtterGui.Widgets.MouseWheelType;
namespace Penumbra.Import.Textures;
@ -53,7 +55,7 @@ public static class TextureDrawer
current.Load(textures, tmpPath);
ImGuiUtil.HoverTooltip(tooltip);
ImGui.SameLine();
Im.Line.Same();
if (ImGuiUtil.DrawDisabledButton(FontAwesomeIcon.Folder.ToIconString(), new Vector2(ImGui.GetFrameHeight()), string.Empty, false,
true))
{
@ -69,7 +71,7 @@ public static class TextureDrawer
fileDialog.OpenFilePicker("Open Image...", "Textures{.png,.dds,.tex,.tga}", UpdatePath, 1, startPath, false);
}
ImGui.SameLine();
Im.Line.Same();
if (ImGuiUtil.DrawDisabledButton(FontAwesomeIcon.Recycle.ToIconString(), new Vector2(ImGui.GetFrameHeight()),
"Reload the currently selected path.", false,
true))