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

Fix merge issues.
Some checks are pending
.NET Build / build (push) Waiting to run
Details

Browse source
This commit is contained in:
Ottermandias 2025-12-19 15:31:47 +01:00
parent f035073966
commit 2418d705f6
6 changed files with 8 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Luna

@ -1 +1 @@
Subproject commit fbfe51b4c39b0f094678f1017f7688632e8f61b8 Subproject commit 4b346670840c3ae0ef33a3f94445ff9c2f55559e

6
Penumbra/Api/Api/UiApi.cs
View file

@ -84,12 +84,6 @@ public class UiApi : IPenumbraApiUi, Luna.IApiService, IDisposable
public void CloseMainWindow() public void CloseMainWindow()
=> _mainWindow.IsOpen = false; => _mainWindow.IsOpen = false;
public PenumbraApiEc RegisterSettingsSection(Action draw)
=> throw new NotImplementedException();
public PenumbraApiEc UnregisterSettingsSection(Action draw)
=> throw new NotImplementedException();
private void OnChangedItemClick(in ChangedItemClick.Arguments arguments) private void OnChangedItemClick(in ChangedItemClick.Arguments arguments)
{ {
if (ChangedItemClicked == null) if (ChangedItemClicked == null)

6
Penumbra/Api/IpcTester/CollectionsIpcTester.cs
View file

@ -151,9 +151,9 @@ public class CollectionsIpcTester(IDalamudPluginInterface pi) : IUiService
Im.Popup.Open("Changed Item List"u8); Im.Popup.Open("Changed Item List"u8);
} }
} }
IpcTester.DrawIntro(RedrawCollectionMembers.Label, "Redraw Collection Members"); IpcTester.DrawIntro(RedrawCollectionMembers.LabelU8, "Redraw Collection Members"u8);
if (ImGui.Button("Redraw##ObjectCollection")) if (Im.Button("Redraw##ObjectCollection"u8))
new RedrawCollectionMembers(pi).Invoke(collectionList[0].Id, RedrawType.Redraw); new RedrawCollectionMembers(pi).Invoke(_collectionId.GetValueOrDefault(Guid.Empty), RedrawType.Redraw);
} }

2
Penumbra/UI/ModsTab/RedrawFooter.cs
View file

@ -1,4 +1,4 @@
using Dalamud.Game.ClientState.Objects; using Dalamud.Plugin.Services;
using FFXIVClientStructs.FFXIV.Client.Game; using FFXIVClientStructs.FFXIV.Client.Game;
using ImSharp; using ImSharp;
using Luna; using Luna;

2
Penumbra/UI/Tabs/ModsTab.cs
View file

@ -1,4 +1,4 @@
using Dalamud.Game.ClientState.Objects; using Dalamud.Plugin.Services;
using Penumbra.UI.Classes; using Penumbra.UI.Classes;
using FFXIVClientStructs.FFXIV.Client.Game; using FFXIVClientStructs.FFXIV.Client.Game;
using ImSharp; using ImSharp;

4
Penumbra/UI/Tabs/SettingsTab.cs
View file

@ -789,8 +789,8 @@ public sealed class SettingsTab : ITab<TabType>
"Edit the raw matrix components of tile UV transforms, instead of having them decomposed into scale, rotation and shear."u8, "Edit the raw matrix components of tile UV transforms, instead of having them decomposed into scale, rotation and shear."u8,
_config.EditRawTileTransforms, v => _config.EditRawTileTransforms = v); _config.EditRawTileTransforms, v => _config.EditRawTileTransforms = v);
Checkbox("Advanced Editing: Always Highlight Color Row Pair when Hovering Selection Button", Checkbox("Advanced Editing: Always Highlight Color Row Pair when Hovering Selection Button"u8,
"Make the whole color row pair selection button highlight the pair in game, instead of just the crosshair, even without holding Control.", "Make the whole color row pair selection button highlight the pair in game, instead of just the crosshair, even without holding Control."u8,
_config.WholePairSelectorAlwaysHighlights, v => _config.WholePairSelectorAlwaysHighlights = v); _config.WholePairSelectorAlwaysHighlights, v => _config.WholePairSelectorAlwaysHighlights = v);
} }