Ticket #539: Update.patch

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

@@ -79 +79 @@
             }
         }
     }
-
-    if (!cursorSet)
+    if (!cursorSet || 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

@@ -64 +64 @@
     bool HasPages();
 
     /**
+     * Determine if the last page is a messagebox
+     */
+    bool LastPageIsMessageBox();
+
+    /**
      * Load a new GUI page and make it active. All current pages will be destroyed.
      */
     void SwitchPage(const CStrW& name, ScriptInterface* srcScriptInterface, JS::HandleValue initData);

source/gui/scripting/ScriptFunctions.cpp

@@ -111 +111 @@
 {
     g_GUI->PopPage();
 }
-
+bool LastGuiPageIsMessageBox(void* UNUSED(cbdata)) 
+{ 
+    return g_GUI->LastPageIsMessageBox(); 
+} 
 // Note that the args argument may only contain clonable data.
 // Functions aren't supported for example!
 // TODO: Use LOGERROR to print a friendly error message when the requirements aren't met instead of failing with debug_warn when cloning.
@@ -925 +928 @@
     scriptInterface.RegisterFunction<void, std::wstring, CScriptVal, &PushGuiPage>("PushGuiPage");
     scriptInterface.RegisterFunction<void, std::wstring, CScriptVal, &SwitchGuiPage>("SwitchGuiPage");
     scriptInterface.RegisterFunction<void, &PopGuiPage>("PopGuiPage");
+    scriptInterface.RegisterFunction<bool, &LastGuiPageIsMessageBox>("LastGuiPageIsMessageBox"); 
     scriptInterface.RegisterFunction<void, CScriptVal, &PopGuiPageCB>("PopGuiPageCB");
     scriptInterface.RegisterFunction<CScriptVal, CStr, &GetGUIObjectByName>("GetGUIObjectByName");