From b0dc6490bfc18ce396ff731becb66a7db0740463 Mon Sep 17 00:00:00 2001
From: liam <6005409+lmcintyre@users.noreply.github.com>
Date: Sat, 10 Apr 2021 23:33:14 -0400
Subject: [PATCH 1/3] fix LaunchButton for viewports in API3

---
 Penumbra/UI/LaunchButton.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Penumbra/UI/LaunchButton.cs b/Penumbra/UI/LaunchButton.cs
index 72ad85b3..040a22f5 100644
--- a/Penumbra/UI/LaunchButton.cs
+++ b/Penumbra/UI/LaunchButton.cs
@@ -42,8 +42,9 @@ namespace Penumbra.UI
                     return;
                 }
 
-                var ss = ImGui.GetIO().DisplaySize;
-
+                var ss = ImGui.GetMainViewport().Size + ImGui.GetMainViewport().Pos;
+                ImGui.SetNextWindowViewport(ImGui.GetMainViewport().ID);
+                
                 ImGui.SetNextWindowPos( ss - WindowPosOffset, ImGuiCond.Always );
 
                 if( !ImGui.Begin( MenuButtonsName, ButtonFlags ) )
@@ -60,4 +61,4 @@ namespace Penumbra.UI
             }
         }
     }
-}
\ No newline at end of file
+}

From 812ab7a787e81537d5d505dc6e5d3f207af8a7a5 Mon Sep 17 00:00:00 2001
From: Liam <lmcintyre995@gmail.com>
Date: Wed, 14 Apr 2021 13:54:08 -0400
Subject: [PATCH 2/3] update dep paths to hooks dev directory

---
 Penumbra/Penumbra.csproj | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Penumbra/Penumbra.csproj b/Penumbra/Penumbra.csproj
index fb6c4401..f2a4863f 100644
--- a/Penumbra/Penumbra.csproj
+++ b/Penumbra/Penumbra.csproj
@@ -30,29 +30,29 @@
         <Reference Include="Dalamud">
             <HintPath>$(DALAMUD_ROOT)\Dalamud.dll</HintPath>
             <HintPath>..\libs\Dalamud.dll</HintPath>
-            <HintPath>$(AppData)\XIVLauncher\addon\Hooks\Dalamud.dll</HintPath>
+            <HintPath>$(AppData)\XIVLauncher\addon\Hooks\dev\Dalamud.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="ImGui.NET">
             <HintPath>$(DALAMUD_ROOT)\ImGui.NET.dll</HintPath>
             <HintPath>..\libs\ImGui.NET.dll</HintPath>
-            <HintPath>$(AppData)\XIVLauncher\addon\Hooks\ImGui.NET.dll</HintPath>
+            <HintPath>$(AppData)\XIVLauncher\addon\Hooks\dev\ImGui.NET.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="ImGuiScene">
             <HintPath>$(DALAMUD_ROOT)\ImGuiScene.dll</HintPath>
             <HintPath>..\libs\ImGuiScene.dll</HintPath>
-            <HintPath>$(AppData)\XIVLauncher\addon\Hooks\ImGuiScene.dll</HintPath>
+            <HintPath>$(AppData)\XIVLauncher\addon\Hooks\dev\ImGuiScene.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="Lumina">
             <HintPath>$(DALAMUD_ROOT)\Lumina.dll</HintPath>
             <HintPath>..\libs\Lumina.dll</HintPath>
-            <HintPath>$(AppData)\XIVLauncher\addon\Hooks\Lumina.dll</HintPath>
+            <HintPath>$(AppData)\XIVLauncher\addon\Hooks\dev\Lumina.dll</HintPath>
             <Private>False</Private>
         </Reference>
     </ItemGroup>
-    
+
     <ItemGroup>
         <Reference Include="System.Windows.Forms" />
         <Reference Include="System.Data.DataSetExtensions" />

From 6edcdcb809f27bb01467c546153964c8bdf54c57 Mon Sep 17 00:00:00 2001
From: Liam <lmcintyre995@gmail.com>
Date: Wed, 14 Apr 2021 13:57:03 -0400
Subject: [PATCH 3/3] update CI to dev path and update distrib url

---
 .github/workflows/build.yml   | 4 ++--
 .github/workflows/release.yml | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 64fe4bfb..db0df2cf 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,8 +19,8 @@ jobs:
         run: dotnet restore
       - name: Download Dalamud
         run: |
-          Invoke-WebRequest -Uri https://goats.dev/ffxiv/tools/launcher/addons/Hooks/latest.zip -OutFile latest.zip
-          Expand-Archive -Force latest.zip "$env:AppData\XIVLauncher\addon\Hooks\"
+          Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/latest.zip -OutFile latest.zip
+          Expand-Archive -Force latest.zip "$env:AppData\XIVLauncher\addon\Hooks\dev\"
       - name: Build
         run: |
           dotnet build --no-restore --configuration Release --nologo
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 22be9eaa..106a69af 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -18,8 +18,8 @@ jobs:
         run: dotnet restore
       - name: Download Dalamud
         run: |
-          Invoke-WebRequest -Uri https://goats.dev/ffxiv/tools/launcher/addons/Hooks/latest.zip -OutFile latest.zip
-          Expand-Archive -Force latest.zip "$env:AppData\XIVLauncher\addon\Hooks\"
+          Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/latest.zip -OutFile latest.zip
+          Expand-Archive -Force latest.zip "$env:AppData\XIVLauncher\addon\Hooks\dev"
       - name: Build
         run: |
           $ver = '${{ github.ref }}' -replace 'refs/tags/',''
@@ -54,7 +54,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps 
+          upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
           asset_path: ./Penumbra.zip
           asset_name: Penumbra.zip
           asset_content_type: application/zip
\ No newline at end of file