From 087cde47006b74499830ab743f01163d037cac4e Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Thu, 7 Oct 2021 18:33:57 +0200
Subject: [PATCH] Fixed a cursor placement issue in GuiTextEditKeyboardPopup.

---
 es-core/src/guis/GuiTextEditKeyboardPopup.cpp | 6 +++---
 es-core/src/guis/GuiTextEditPopup.cpp         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/es-core/src/guis/GuiTextEditKeyboardPopup.cpp b/es-core/src/guis/GuiTextEditKeyboardPopup.cpp
index b3f46a3d3..a3ce28161 100644
--- a/es-core/src/guis/GuiTextEditKeyboardPopup.cpp
+++ b/es-core/src/guis/GuiTextEditKeyboardPopup.cpp
@@ -133,9 +133,6 @@ GuiTextEditKeyboardPopup::GuiTextEditKeyboardPopup(
     mText = std::make_shared<TextEditComponent>(mWindow);
     mText->setValue(initValue);
 
-    if (!multiLine)
-        mText->setCursor(initValue.size());
-
     // Header.
     mGrid.setEntry(mTitle, glm::ivec2{0, 0}, false, true);
 
@@ -289,6 +286,9 @@ GuiTextEditKeyboardPopup::GuiTextEditKeyboardPopup(
         setPosition((static_cast<float>(Renderer::getScreenWidth()) - mSize.x) / 2.0f,
                     (static_cast<float>(Renderer::getScreenHeight()) - mSize.y) / 2.0f);
     }
+
+    if (!multiLine)
+        mText->setCursor(initValue.size());
 }
 
 void GuiTextEditKeyboardPopup::onSizeChanged()
diff --git a/es-core/src/guis/GuiTextEditPopup.cpp b/es-core/src/guis/GuiTextEditPopup.cpp
index 132d81056..71d13cb5e 100644
--- a/es-core/src/guis/GuiTextEditPopup.cpp
+++ b/es-core/src/guis/GuiTextEditPopup.cpp
@@ -102,7 +102,7 @@ GuiTextEditPopup::GuiTextEditPopup(Window* window,
     if (multiLine)
         textHeight *= 6.0f;
 
-    mText->setSize(0, textHeight);
+    mText->setSize(0.0f, textHeight);
 
     // Adapt width to the geometry of the display. The 1.778 aspect ratio is the 16:9 reference.
     float aspectValue = 1.778f / Renderer::getScreenAspectRatio();