From 4c7d06452ec7d839057b136912941e6931fc7124 Mon Sep 17 00:00:00 2001
From: maverickdgg <danielcyc38@gmail.com>
Date: Mon, 27 Feb 2023 15:25:01 +0800
Subject: [PATCH] viewport changed

---
 Assets/Scenes/MainGame.shade                                   | 2 +-
 .../Editor/EditorWindow/ViewportWindow/SHEditorViewport.cpp    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Assets/Scenes/MainGame.shade b/Assets/Scenes/MainGame.shade
index bc658058..4e58a29b 100644
--- a/Assets/Scenes/MainGame.shade
+++ b/Assets/Scenes/MainGame.shade
@@ -9667,7 +9667,7 @@
   NumberOfChildren: 1
   Components:
     Transform Component:
-      Translate: {x: -900, y: 450, z: 0}
+      Translate: {x: -850, y: 450, z: 0}
       Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 400, y: 100, z: 1}
       IsActive: true
diff --git a/SHADE_Engine/src/Editor/EditorWindow/ViewportWindow/SHEditorViewport.cpp b/SHADE_Engine/src/Editor/EditorWindow/ViewportWindow/SHEditorViewport.cpp
index fde2a5f3..9b055535 100644
--- a/SHADE_Engine/src/Editor/EditorWindow/ViewportWindow/SHEditorViewport.cpp
+++ b/SHADE_Engine/src/Editor/EditorWindow/ViewportWindow/SHEditorViewport.cpp
@@ -70,7 +70,8 @@ namespace SHADE
       beginCursorPos = ImGui::GetCursorScreenPos();
       viewportMousePos = { mousePos.x - beginCursorPos.x, mousePos.y - beginCursorPos.y };
       gfxSystem->GetMousePickSystem()->SetViewportMousePos(viewportMousePos);
-      ImGui::Image((ImTextureID)descriptorSet, { beginContentRegionAvailable.x, beginContentRegionAvailable.y });
+      SHVec2 viewportSize = CalculateWindowSize(beginContentRegionAvailable);
+      ImGui::Image((ImTextureID)descriptorSet, { viewportSize.x, viewportSize.y });
 
       if (ImGui::IsWindowHovered() && ImGui::IsMouseDown(ImGuiMouseButton_Right))
       {