Ticket #539: Update.2.patch

binaries/data/mods/public/gui/session/input.js

@@ -80 +80 @@
         }
     }
 
-    if (!cursorSet)
+    if (!cursorSet || Engine.LastGuiPageIsMessageBox())
         Engine.SetCursor("arrow-default");
     if (!tooltipSet)
         informationTooltip.hidden = true;

source/gui/GUIManager.cpp

@@ -66 +66 @@
     UnregisterFileReloadFunc(ReloadChangedFileCB, this);
 }
 
+bool CGUIManager::LastPageIsMessageBox()  
+{ 
+    if (m_PageStack.back().name == L"page_msgbox.xml") 
+        return true; 
+    return false; 
+}
+
 bool CGUIManager::HasPages()
 {
     return !m_PageStack.empty();

source/gui/GUIManager.h

@@ -58 +58 @@
     shared_ptr<ScriptRuntime> GetRuntime() { return m_ScriptRuntime; }
     shared_ptr<CGUI> GetActiveGUI() { return top(); }
 
+    /** 
+    * Determine if the last page is a messagebox 
+    */ 
+    bool LastPageIsMessageBox(); 
+
     /**
      * Returns whether there are any current pages.
      */

source/gui/scripting/ScriptFunctions.cpp

@@ -97 +97 @@
     g_GUI->PushPage(name, pCxPrivate->pScriptInterface->WriteStructuredClone(initData));
 }
 
+bool LastGuiPageIsMessageBox(ScriptInterface::CxPrivate* UNUSED(pCxPrivate)) 
+{ 
+    return g_GUI->LastPageIsMessageBox(); 
+} 
+
 void SwitchGuiPage(ScriptInterface::CxPrivate* pCxPrivate, std::wstring name, CScriptVal initData1)
 {
     JSContext* cx = pCxPrivate->pScriptInterface->GetContext();
@@ -922 +927 @@
     scriptInterface.RegisterFunction<CScriptVal, std::wstring, &JSI_VFS::ReadFile>("ReadFile");
     scriptInterface.RegisterFunction<CScriptVal, std::wstring, &JSI_VFS::ReadFileLines>("ReadFileLines");
     // GUI manager functions:
+    scriptInterface.RegisterFunction<bool, &LastGuiPageIsMessageBox>("LastGuiPageIsMessageBox"); 
     scriptInterface.RegisterFunction<void, std::wstring, CScriptVal, &PushGuiPage>("PushGuiPage");
     scriptInterface.RegisterFunction<void, std::wstring, CScriptVal, &SwitchGuiPage>("SwitchGuiPage");
     scriptInterface.RegisterFunction<void, &PopGuiPage>("PopGuiPage");