From 6c040389acaafb2196778ecc779ed792bffe1e42 Mon Sep 17 00:00:00 2001
From: Liza Carvelli <liza@carvel.li>
Date: Wed, 27 Mar 2024 19:21:41 +0100
Subject: [PATCH] Fix UI scaling issues

---
 Workshoppa/Windows/MainWindow.cs | 33 +++++++++++++++++++-------------
 Workshoppa/Workshoppa.csproj     |  2 +-
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/Workshoppa/Windows/MainWindow.cs b/Workshoppa/Windows/MainWindow.cs
index 5cf7286..d4b4eb2 100644
--- a/Workshoppa/Windows/MainWindow.cs
+++ b/Workshoppa/Windows/MainWindow.cs
@@ -93,9 +93,9 @@ internal sealed class MainWindow : LWindow
             IDalamudTextureWrap? icon = _iconCache.GetIcon(currentCraft.IconId);
             if (icon != null)
             {
-                ImGui.Image(icon.ImGuiHandle, new Vector2(23, 23));
-                ImGui.SameLine(0, 3);
-                ImGui.SetCursorPosY(ImGui.GetCursorPosY() + 3);
+                ImGui.Image(icon.ImGuiHandle, new Vector2(ImGui.GetFrameHeight()));
+                ImGui.SameLine(0, ImGui.GetStyle().ItemInnerSpacing.X);
+                ImGui.SetCursorPosY(ImGui.GetCursorPosY() + (ImGui.GetFrameHeight() - ImGui.GetTextLineHeight()) / 2);
             }
 
             ImGui.TextUnformatted($"{currentCraft.Name}");
@@ -195,11 +195,11 @@ internal sealed class MainWindow : LWindow
             IDalamudTextureWrap? icon = _iconCache.GetIcon(craft.IconId);
             if (icon != null)
             {
-                ImGui.Image(icon.ImGuiHandle, new Vector2(23, 23));
-                ImGui.SameLine(0, 3);
+                ImGui.Image(icon.ImGuiHandle, new Vector2(ImGui.GetFrameHeight()));
+                ImGui.SameLine(0, ImGui.GetStyle().ItemInnerSpacing.X);
             }
 
-            ImGui.SetNextItemWidth(100);
+            ImGui.SetNextItemWidth(Math.Max(100 * ImGui.GetIO().FontGlobalScale, 4 * (ImGui.GetFrameHeight() + ImGui.GetStyle().FramePadding.X)));
             int quantity = item.Quantity;
             if (ImGui.InputInt(craft.Name, ref quantity))
             {
@@ -236,14 +236,14 @@ internal sealed class MainWindow : LWindow
                          .OrderBy(x => x.WorkshopItemId))
             {
                 IDalamudTextureWrap? icon = _iconCache.GetIcon(craft.IconId);
+                Vector2 pos = ImGui.GetCursorPos();
+                Vector2 iconSize = new Vector2(ImGui.GetTextLineHeight() + ImGui.GetStyle().ItemSpacing.Y);
                 if (icon != null)
                 {
-                    ImGui.Image(icon.ImGuiHandle, new Vector2(23, 23));
-                    ImGui.SameLine();
-                    ImGui.SetCursorPosY(ImGui.GetCursorPosY() + 3);
+                    ImGui.SetCursorPos(pos + new Vector2(iconSize.X + ImGui.GetStyle().FramePadding.X, ImGui.GetStyle().ItemSpacing.Y / 2));
                 }
 
-                if (ImGui.Selectable($"{craft.Name}##SelectCraft{craft.WorkshopItemId}"))
+                if (ImGui.Selectable($"{craft.Name}##SelectCraft{craft.WorkshopItemId}", false, ImGuiSelectableFlags.SpanAllColumns))
                 {
                     _configuration.ItemQueue.Add(new Configuration.QueuedItem
                     {
@@ -252,6 +252,13 @@ internal sealed class MainWindow : LWindow
                     });
                     Save();
                 }
+
+                if (icon != null)
+                {
+                    ImGui.SameLine(0, 0);
+                    ImGui.SetCursorPos(pos);
+                    ImGui.Image(icon.ImGuiHandle, iconSize);
+                }
             }
 
             ImGui.EndCombo();
@@ -535,9 +542,9 @@ internal sealed class MainWindow : LWindow
             IDalamudTextureWrap? icon = _iconCache.GetIcon(item.IconId);
             if (icon != null)
             {
-                ImGui.Image(icon.ImGuiHandle, new Vector2(23, 23));
-                ImGui.SameLine(0, 3);
-                ImGui.SetCursorPosY(ImGui.GetCursorPosY() + 3);
+                ImGui.Image(icon.ImGuiHandle, new Vector2(ImGui.GetFrameHeight()));
+                ImGui.SameLine(0, ImGui.GetStyle().ItemInnerSpacing.X);
+                ImGui.SetCursorPosY(ImGui.GetCursorPosY() + (ImGui.GetFrameHeight() - ImGui.GetTextLineHeight()) / 2);
             }
 
             ImGui.TextColored(inInventory >= item.TotalQuantity ? ImGuiColors.HealerGreen : ImGuiColors.DalamudRed,
diff --git a/Workshoppa/Workshoppa.csproj b/Workshoppa/Workshoppa.csproj
index 25e1bef..58f9431 100644
--- a/Workshoppa/Workshoppa.csproj
+++ b/Workshoppa/Workshoppa.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFramework>net8.0-windows</TargetFramework>
-        <Version>5.1</Version>
+        <Version>5.2</Version>
         <LangVersion>11.0</LangVersion>
         <Nullable>enable</Nullable>
         <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>