diff --git a/Waitingway/Configuration.cs b/Waitingway/Configuration.cs index 18e2d77..476a7e9 100644 --- a/Waitingway/Configuration.cs +++ b/Waitingway/Configuration.cs @@ -44,7 +44,7 @@ public Uri ServerUri public EstimatorType Estimator { get; set; } = EstimatorType.Geometric; public float DefaultRate { get; set; } = 75; public int MinimumPositionThreshold { get; set; } = 40; - public int NotificationThreshold { get; set; } = 0; + public int NotificationThreshold { get; set; } public void Save() => Service.PluginInterface.SavePluginConfig(this); diff --git a/Waitingway/Utils/ImGuiUtils.cs b/Waitingway/Utils/ImGuiUtils.cs index f292a06..5d293a7 100644 --- a/Waitingway/Utils/ImGuiUtils.cs +++ b/Waitingway/Utils/ImGuiUtils.cs @@ -12,7 +12,7 @@ public static class ImGuiUtils { private static Vector2 GetIconSize(FontAwesomeIcon icon) { - using var font = Service.PluginInterface.UiBuilder.IconFontFixedWidthHandle.Push(); + using var font = Service.PluginInterface.UiBuilder.IconFontHandle.Push(); return ImGui.CalcTextSize(icon.ToIconString()); } @@ -25,12 +25,12 @@ private static void DrawCenteredIcon(FontAwesomeIcon icon, Vector2 offset, Vecto if (iconSize.X > iconSize.Y) { scale = size.X / iconSize.X; - iconOffset = new(0, (size.Y - (iconSize.Y * scale)) / 2f); + iconOffset = new(0, size.Y - (iconSize.Y * scale)); } else if (iconSize.Y > iconSize.X) { scale = size.Y / iconSize.Y; - iconOffset = new((size.X - (iconSize.X * scale)) / 2f, 0); + iconOffset = new(size.X - (iconSize.X * scale), 0); } else { @@ -38,7 +38,7 @@ private static void DrawCenteredIcon(FontAwesomeIcon icon, Vector2 offset, Vecto iconOffset = Vector2.Zero; } - using var font = Service.PluginInterface.UiBuilder.IconFontFixedWidthHandle.Lock(); + using var font = Service.PluginInterface.UiBuilder.IconFontHandle.Lock(); ImGui.GetWindowDrawList().AddText(font.ImFont, font.ImFont.FontSize * scale, offset + iconOffset, ImGui.GetColorU32(!isDisabled ? ImGuiCol.Text : ImGuiCol.TextDisabled), icon.ToIconString()); } @@ -54,7 +54,7 @@ public static bool IconButtonSquare(FontAwesomeIcon icon, float size = -1) ret = true; var isDisabled = ImGuiInternals.GetItemFlags().HasFlag(ImGuiItemFlags.Disabled); - DrawCenteredIcon(icon, pos + spacing, buttonSize - spacing * 2 + Vector2.One, isDisabled); + DrawCenteredIcon(icon, pos + spacing, buttonSize - spacing * 2, isDisabled); return ret; } diff --git a/Waitingway/Waitingway.csproj b/Waitingway/Waitingway.csproj index 873467f..197c78a 100644 --- a/Waitingway/Waitingway.csproj +++ b/Waitingway/Waitingway.csproj @@ -2,7 +2,7 @@ Asriel Camora - 2.0.0 + 2.0.1 https://github.com/WorkingRobot/Waitingway Debug;Release Waitingway.Dalamud diff --git a/web/Cargo.lock b/web/Cargo.lock index bfaee9c..a55270e 100644 --- a/web/Cargo.lock +++ b/web/Cargo.lock @@ -3139,7 +3139,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "waitingway-web" -version = "2.0.0" +version = "2.0.1" dependencies = [ "actix-cors", "actix-web", diff --git a/web/Cargo.toml b/web/Cargo.toml index 93daf7a..c39c26f 100644 --- a/web/Cargo.toml +++ b/web/Cargo.toml @@ -3,7 +3,7 @@ name = "waitingway-web" authors = ["Asriel Camora "] description = "Backend web server for Waitingway" repository = "https://github.com/WorkingRobot/Waitingway" -version = "2.0.0" +version = "2.0.1" edition = "2021" [dependencies]