fix some warnings

This commit is contained in:
goat 2024-11-04 15:01:09 +01:00
parent 0c87717ffc
commit 8956bd54a9
9 changed files with 27 additions and 16 deletions

View file

@ -300,7 +300,7 @@ internal unsafe class UiDebug
{
ImGui.Image(
new IntPtr(kernelTexture->D3D11ShaderResourceView),
new Vector2(kernelTexture->Width, kernelTexture->Height));
new Vector2(kernelTexture->ActualWidth, kernelTexture->ActualHeight));
ImGui.TreePop();
}
}
@ -312,8 +312,8 @@ internal unsafe class UiDebug
ImGui.Image(
new IntPtr(textureInfo->AtkTexture.KernelTexture->D3D11ShaderResourceView),
new Vector2(
textureInfo->AtkTexture.KernelTexture->Width,
textureInfo->AtkTexture.KernelTexture->Height));
textureInfo->AtkTexture.KernelTexture->ActualWidth,
textureInfo->AtkTexture.KernelTexture->ActualHeight));
ImGui.TreePop();
}
}

View file

@ -172,7 +172,7 @@ internal unsafe partial class ImageNodeTree : ResNodeTree
var cursorScreenPos = ImGui.GetCursorScreenPos();
var cursorLocalPos = ImGui.GetCursorPos();
ImGui.Image(new(this.TexData.Texture->D3D11ShaderResourceView), new(this.TexData.Texture->Width, this.TexData.Texture->Height));
ImGui.Image(new(this.TexData.Texture->D3D11ShaderResourceView), new(this.TexData.Texture->ActualWidth, this.TexData.Texture->ActualHeight));
for (uint p = 0; p < this.TexData.PartsList->PartCount; p++)
{
@ -197,8 +197,8 @@ internal unsafe partial class ImageNodeTree : ResNodeTree
ImGui.TableHeadersRow();
var tWidth = this.TexData.Texture->Width;
var tHeight = this.TexData.Texture->Height;
var tWidth = this.TexData.Texture->ActualWidth;
var tHeight = this.TexData.Texture->ActualHeight;
var textureSize = new Vector2(tWidth, tHeight);
for (ushort i = 0; i < this.TexData.PartCount; i++)

View file

@ -287,7 +287,7 @@ public abstract class Window
this.IsFocused = false;
if (doSoundEffects && !this.DisableWindowSounds) UIModule.PlaySound(this.OnCloseSfxId, 0, 0, 0);
if (doSoundEffects && !this.DisableWindowSounds) UIGlobals.PlaySoundEffect(this.OnCloseSfxId, 0, 0, 0);
}
return;
@ -307,7 +307,7 @@ public abstract class Window
this.internalLastIsOpen = this.internalIsOpen;
this.OnOpen();
if (doSoundEffects && !this.DisableWindowSounds) UIModule.PlaySound(this.OnOpenSfxId, 0, 0, 0);
if (doSoundEffects && !this.DisableWindowSounds) UIGlobals.PlaySoundEffect(this.OnOpenSfxId, 0, 0, 0);
}
this.PreDraw();
@ -347,7 +347,7 @@ public abstract class Window
}
catch (Exception ex)
{
Log.Error(ex, $"Error during Draw(): {this.WindowName}");
Log.Error(ex, "Error during Draw(): {WindowName}", this.WindowName);
}
}