ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-12 18:27:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update obsolete properties from CS.

Browse source
This commit is contained in:
Ottermandias 2024-10-06 11:58:00 +02:00
parent caf4382e1f
commit 776b4e9efb
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Penumbra/Interop/MaterialPreview/LiveColorTablePreviewer.cs
View file

@ -40,8 +40,8 @@ public sealed unsafe class LiveColorTablePreviewer : LiveMaterialPreviewerBase
if (_originalColorTableTexture.Texture == null)
throw new InvalidOperationException("Material doesn't have a color table");
Width = (int)_originalColorTableTexture.Texture->Width;
Height = (int)_originalColorTableTexture.Texture->Height;
Width = (int)_originalColorTableTexture.Texture->ActualWidth;
Height = (int)_originalColorTableTexture.Texture->ActualHeight;
ColorTable = new Half[Width * Height * 4];
_updatePending = true;

6
Penumbra/UI/AdvancedWindow/Materials/MaterialTemplatePickers.cs
View file

@ -56,7 +56,7 @@ public sealed unsafe class MaterialTemplatePickers : IUiService
}
var firstNonNullTexture = firstNonNullTextureRH != null ? firstNonNullTextureRH->CsHandle.Texture : null;
var textureSize = firstNonNullTexture != null ? new Vector2(firstNonNullTexture->Width, firstNonNullTexture->Height).Contain(new Vector2(MaximumTextureSize)) : Vector2.Zero;
var textureSize = firstNonNullTexture != null ? new Vector2(firstNonNullTexture->ActualWidth, firstNonNullTexture->ActualHeight).Contain(new Vector2(MaximumTextureSize)) : Vector2.Zero;
var count = firstNonNullTexture != null ? firstNonNullTexture->ArraySize : 0;
var ret = false;
@ -135,10 +135,10 @@ public sealed unsafe class MaterialTemplatePickers : IUiService
continue;
var position = regionStart with { X = regionStart.X + (itemSize.X + itemSpacing) * j };
var size = new Vector2(texture->Width, texture->Height).Contain(itemSize);
var size = new Vector2(texture->ActualWidth, texture->ActualHeight).Contain(itemSize);
position += (itemSize - size) * 0.5f;
ImGui.GetWindowDrawList().AddImage(handle, position, position + size, Vector2.Zero,
new Vector2(texture->Width / (float)texture->Width2, texture->Height / (float)texture->Height2));
new Vector2(texture->ActualWidth / (float)texture->AllocatedWidth, texture->ActualHeight / (float)texture->AllocatedHeight));
}
}