mirror of
https://github.com/goatcorp/Dalamud.git
synced 2025-12-12 18:27:23 +01:00
Compare commits
2 commits
e07bda7e58
...
a39763f161
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a39763f161 | ||
|
|
201c9cfcf2 |
2 changed files with 8 additions and 3 deletions
|
|
@ -494,7 +494,12 @@ internal sealed unsafe partial class Win32InputHandler : IImGuiInputHandler
|
||||||
// (This is the position you can get with ::GetCursorPos() or WM_MOUSEMOVE + ::ClientToScreen(). In theory adding viewport->Pos to a client position would also be the same.)
|
// (This is the position you can get with ::GetCursorPos() or WM_MOUSEMOVE + ::ClientToScreen(). In theory adding viewport->Pos to a client position would also be the same.)
|
||||||
var mousePos = mouseScreenPos;
|
var mousePos = mouseScreenPos;
|
||||||
if ((io.ConfigFlags & ImGuiConfigFlags.ViewportsEnable) == 0)
|
if ((io.ConfigFlags & ImGuiConfigFlags.ViewportsEnable) == 0)
|
||||||
ClientToScreen(focusedWindow, &mousePos);
|
{
|
||||||
|
// Use game window, otherwise, positions are calculated based on the focused window which might not be the game.
|
||||||
|
// Leads to offsets.
|
||||||
|
ClientToScreen(this.hWnd, &mousePos);
|
||||||
|
}
|
||||||
|
|
||||||
io.AddMousePosEvent(mousePos.x, mousePos.y);
|
io.AddMousePosEvent(mousePos.x, mousePos.y);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -84,7 +84,7 @@ public abstract class Window
|
||||||
Click = _ =>
|
Click = _ =>
|
||||||
{
|
{
|
||||||
this.internalIsClickthrough = false;
|
this.internalIsClickthrough = false;
|
||||||
this.presetDirty = false;
|
this.presetDirty = true;
|
||||||
ImGui.OpenPopup(AdditionsPopupName);
|
ImGui.OpenPopup(AdditionsPopupName);
|
||||||
},
|
},
|
||||||
Priority = int.MinValue,
|
Priority = int.MinValue,
|
||||||
|
|
@ -905,7 +905,7 @@ public abstract class Window
|
||||||
private void DrawErrorMessage()
|
private void DrawErrorMessage()
|
||||||
{
|
{
|
||||||
// TODO: Once window systems are services, offer to reload the plugin
|
// TODO: Once window systems are services, offer to reload the plugin
|
||||||
ImGui.TextColoredWrapped(ImGuiColors.DalamudRed,Loc.Localize("WindowSystemErrorOccurred", "An error occurred while rendering this window. Please contact the developer for details."));
|
ImGui.TextColoredWrapped(ImGuiColors.DalamudRed, Loc.Localize("WindowSystemErrorOccurred", "An error occurred while rendering this window. Please contact the developer for details."));
|
||||||
|
|
||||||
ImGuiHelpers.ScaledDummy(5);
|
ImGuiHelpers.ScaledDummy(5);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue