Ticket #539: patch_v2.patch

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

@@ -56 +56 @@
     var cursorSet = false;
     var tooltipSet = false;
     var informationTooltip = getGUIObjectByName("informationTooltip");
+
     if (!mouseIsOverObject)
     {
         var action = determineAction(mouseX, mouseY);
@@ -77 +78 @@
             }
         }
     }
-
-    if (!cursorSet)
+    var lastGuiPageIsMessageBox = Engine.LastGuiPageIsMessageBox();
+    if (!cursorSet || lastGuiPageIsMessageBox)
+    {
         Engine.SetCursor("arrow-default");
+    }
     if (!tooltipSet)
         informationTooltip.hidden = true;
     

source/gui/GUIManager.cpp

@@ -66 +66 @@
     return !m_PageStack.empty();
 }
 
+bool CGUIManager::LastPageIsMessageBox()
+{
+    if (m_PageStack.back().name == L"page_msgbox.xml")
+    {
+        return true;
+    }
+    return false;
+}
+
 void CGUIManager::SwitchPage(const CStrW& pageName, CScriptVal initData)
 {
     m_PageStack.clear();
@@ -75 +84 @@
 void CGUIManager::PushPage(const CStrW& pageName, CScriptVal initData)
 {
     m_PageStack.push_back(SGUIPage());
+
     m_PageStack.back().name = pageName;
     m_PageStack.back().initData = CScriptValRooted(m_ScriptInterface.GetContext(), initData);
     LoadPage(m_PageStack.back());

source/gui/GUIManager.h

@@ -57 +57 @@
     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, CScriptVal initData);

source/gui/scripting/ScriptFunctions.cpp

@@ -93 +93 @@
     g_GUI->PopPage();
 }
 
+bool LastGuiPageIsMessageBox(void* UNUSED(cbdata))
+{
+    return g_GUI->LastPageIsMessageBox();
+}
+
 CScriptVal GuiInterfaceCall(void* cbdata, std::wstring name, CScriptVal data)
 {
     CGUIManager* guiManager = static_cast<CGUIManager*> (cbdata);
@@ -641 +646 @@
     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");
 
     // Simulation<->GUI interface functions:
     scriptInterface.RegisterFunction<CScriptVal, std::wstring, CScriptVal, &GuiInterfaceCall>("GuiInterfaceCall");