ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 10:17:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix conds in Window

Browse source
This commit is contained in:
goaaats 2025-04-14 21:06:38 +02:00
parent 47b4a9b502
commit 6858c646a2
15 changed files with 40 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dalamud.CorePlugin/PluginWindow.cs
View file

@ -20,7 +20,7 @@ namespace Dalamud.CorePlugin
this.IsOpen = true;
this.Size = new Vector2(810, 520);
this.SizeCondition = ImGuiCond.FirstUseEver;
this.SizeConditionNew = ImGuiCond.FirstUseEver;
}
/// <inheritdoc/>

4
Dalamud/Interface/Internal/UiDebug2/Popout.Addon.cs
View file

@ -23,14 +23,14 @@ internal class AddonPopoutWindow : Window, IDisposable
: base(name)
{
this.addonTree = tree;
this.PositionCondition = ImGuiCond.Once;
this.PositionConditionNew = ImGuiCond.Once;
var pos = ImGui.GetMousePos() + new Vector2(50, -50);
var workSize = ImGui.GetMainViewport().WorkSize;
var pos2 = new Vector2(Math.Min(workSize.X - 750, pos.X), Math.Min(workSize.Y - 250, pos.Y));
this.Position = pos2;
this.SizeCondition = ImGuiCond.Once;
this.SizeConditionNew = ImGuiCond.Once;
this.Size = new(700, 200);
this.IsOpen = true;
this.SizeConstraints = new() { MinimumSize = new(100, 100) };

4
Dalamud/Interface/Internal/UiDebug2/Popout.Node.cs
View file

@ -35,8 +35,8 @@ internal unsafe class NodePopoutWindow : Window, IDisposable
this.Position = pos2;
this.IsOpen = true;
this.PositionCondition = ImGuiCond.Once;
this.SizeCondition = ImGuiCond.Once;
this.PositionConditionNew = ImGuiCond.Once;
this.SizeConditionNew = ImGuiCond.Once;
this.Size = new(700, 200);
this.SizeConstraints = new() { MinimumSize = new(100, 100) };
}

2
Dalamud/Interface/Internal/Windows/ChangelogWindow.cs
View file

@ -216,7 +216,7 @@ internal sealed class ChangelogWindow : Window, IDisposable
ImGui.SetNextWindowBgAlpha(Math.Clamp(this.windowFade.EasedPoint.X, 0, 0.9f));
this.Size = new Vector2(900, 400);
this.SizeCondition = ImGuiCond.Always;
this.SizeConditionNew = ImGuiCond.Always;
// Center the window on the main viewport
var viewportPos = ImGuiHelpers.MainViewport.Pos;

2
Dalamud/Interface/Internal/Windows/ColorDemoWindow.cs
View file

@ -23,7 +23,7 @@ internal sealed class ColorDemoWindow : Window
: base("Dalamud Colors Demo")
{
this.Size = new Vector2(600, 500);
this.SizeCondition = ImGuiCond.FirstUseEver;
this.SizeConditionNew = ImGuiCond.FirstUseEver;
this.colors = new List<(string Name, Vector4 Color)>()
{

2
Dalamud/Interface/Internal/Windows/ComponentDemoWindow.cs
View file

@ -38,7 +38,7 @@ internal sealed class ComponentDemoWindow : Window
: base("Dalamud Components Demo")
{
this.Size = new Vector2(600, 500);
this.SizeCondition = ImGuiCond.FirstUseEver;
this.SizeConditionNew = ImGuiCond.FirstUseEver;
this.RespectCloseHotkey = false;

2
Dalamud/Interface/Internal/Windows/ConsoleWindow.cs
View file

@ -100,7 +100,7 @@ internal class ConsoleWindow : Window, IDisposable
cm.AddAlias("clear", "cls");
this.Size = new Vector2(500, 400);
this.SizeCondition = ImGuiCond.FirstUseEver;
this.SizeConditionNew = ImGuiCond.FirstUseEver;
this.RespectCloseHotkey = false;

2
Dalamud/Interface/Internal/Windows/Data/DataWindow.cs
View file

@ -78,7 +78,7 @@ internal class DataWindow : Window, IDisposable
: base("Dalamud Data", ImGuiWindowFlags.NoScrollbar | ImGuiWindowFlags.NoScrollWithMouse)
{
this.Size = new Vector2(400, 300);
this.SizeCondition = ImGuiCond.FirstUseEver;
this.SizeConditionNew = ImGuiCond.FirstUseEver;
this.RespectCloseHotkey = false;
this.orderedModules = this.modules.OrderBy(module => module.DisplayName);

2
Dalamud/Interface/Internal/Windows/GamepadModeNotifierWindow.cs
View file

@ -24,7 +24,7 @@ internal class GamepadModeNotifierWindow : Window
true)
{
this.Size = Vector2.Zero;
this.SizeCondition = ImGuiCond.Always;
this.SizeConditionNew = ImGuiCond.Always;
this.IsOpen = false;
this.RespectCloseHotkey = false;

2
Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs
View file

@ -152,7 +152,7 @@ internal class PluginInstallerWindow : Window, IDisposable
this.imageCache = imageCache;
this.Size = new Vector2(830, 570);
this.SizeCondition = ImGuiCond.FirstUseEver;
this.SizeConditionNew = ImGuiCond.FirstUseEver;
this.SizeConstraints = new WindowSizeConstraints
{

2
Dalamud/Interface/Internal/Windows/PluginStatWindow.cs
View file

@ -36,7 +36,7 @@ internal class PluginStatWindow : Window
this.RespectCloseHotkey = false;
this.Size = new Vector2(810, 520);
this.SizeCondition = ImGuiCond.FirstUseEver;
this.SizeConditionNew = ImGuiCond.FirstUseEver;
}
/// <inheritdoc/>

2
Dalamud/Interface/Internal/Windows/SelfTest/SelfTestWindow.cs
View file

@ -71,7 +71,7 @@ internal class SelfTestWindow : Window
: base("Dalamud Self-Test", ImGuiWindowFlags.NoScrollbar | ImGuiWindowFlags.NoScrollWithMouse)
{
this.Size = new Vector2(800, 800);
this.SizeCondition = ImGuiCond.FirstUseEver;
this.SizeConditionNew = ImGuiCond.FirstUseEver;
this.RespectCloseHotkey = false;
}

2
Dalamud/Interface/Internal/Windows/Settings/SettingsWindow.cs
View file

@ -39,7 +39,7 @@ internal class SettingsWindow : Window
MaximumSize = new Vector2(1780, 940),
};
this.SizeCondition = ImGuiCond.FirstUseEver;
this.SizeConditionNew = ImGuiCond.FirstUseEver;
this.tabs =
[

2
Dalamud/Interface/Internal/Windows/TitleScreenMenuWindow.cs
View file

@ -100,7 +100,7 @@ internal class TitleScreenMenuWindow : Window, IDisposable
this.ForceMainWindow = true;
this.Position = new Vector2(0, 200);
this.PositionCondition = ImGuiCond.Always;
this.PositionConditionNew = ImGuiCond.Always;
this.RespectCloseHotkey = false;
this.shadeTexture = new(() => dalamudAssetManager.GetDalamudTextureWrap(DalamudAsset.TitleScreenMenuShade));

28
Dalamud/Interface/Windowing/Window.cs
View file

@ -158,7 +158,17 @@ public abstract class Window
/// <summary>
/// Gets or sets the condition that defines when the position of this window is set.
/// </summary>
public ImGuiCond PositionCondition { get; set; }
public ImGuiCond PositionConditionNew
{
get => (ImGuiCond)this.PositionCondition;
set => this.PositionCondition = (ImGuiNET.ImGuiCond)value;
}
/// <summary>
/// Gets or sets the condition that defines when the position of this window is set.
/// </summary>
[ImGuiBindingsToDo("Remove. Rename New.")]
public ImGuiNET.ImGuiCond PositionCondition { get; set; }
/// <summary>
/// Gets or sets the size of the window. The size provided will be scaled by the global scale.
@ -168,7 +178,17 @@ public abstract class Window
/// <summary>
/// Gets or sets the condition that defines when the size of this window is set.
/// </summary>
public ImGuiCond SizeCondition { get; set; }
public ImGuiCond SizeConditionNew
{
get => (ImGuiCond)this.SizeCondition;
set => this.SizeCondition = (ImGuiNET.ImGuiCond)value;
}
/// <summary>
/// Gets or sets the condition that defines when the size of this window is set.
/// </summary>
[ImGuiBindingsToDo("Remove. Rename New.")]
public ImGuiNET.ImGuiCond SizeCondition { get; set; }
/// <summary>
/// Gets or sets the size constraints of the window. The size constraints provided will be scaled by the global scale.
@ -588,12 +608,12 @@ public abstract class Window
if (this.ForceMainWindow)
pos += ImGuiHelpers.MainViewport.Pos;
ImGui.SetNextWindowPos(pos, this.PositionCondition);
ImGui.SetNextWindowPos(pos, this.PositionConditionNew);
}
if (this.Size.HasValue)
{
ImGui.SetNextWindowSize(this.Size.Value * ImGuiHelpers.GlobalScale, this.SizeCondition);
ImGui.SetNextWindowSize(this.Size.Value * ImGuiHelpers.GlobalScale, this.SizeConditionNew);
}
if (this.Collapsed.HasValue)