Ticket #539: patch.patch

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

@@ -78 +78 @@
         }
     }
 
-    if (!cursorSet)
+    var sizeGuiPage = Engine.SizeGuiPage();
+    if (!cursorSet || sizeGuiPage > 1 )
+    {
         Engine.SetCursor("arrow-default");
+    }
     if (!tooltipSet)
         informationTooltip.hidden = true;
     

source/gui/GUIManager.cpp

@@ -66 +66 @@
     return !m_PageStack.empty();
 }
 
+int CGUIManager::SizePages()
+{
+    return m_PageStack.size();
+}
+
 void CGUIManager::SwitchPage(const CStrW& pageName, CScriptVal initData)
 {
     m_PageStack.clear();

source/gui/GUIManager.h

@@ -57 +57 @@
     bool HasPages();
 
     /**
+     * Determine the number of page
+     */
+    int CGUIManager::SizePages();
+
+    /**
      * 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();
 }
 
+int SizeGuiPage(void* UNUSED(cbdata))
+{
+    return g_GUI->SizePages();
+}
+
 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<int, &SizeGuiPage>("SizeGuiPage");
 
     // Simulation<->GUI interface functions:
     scriptInterface.RegisterFunction<CScriptVal, std::wstring, CScriptVal, &GuiInterfaceCall>("GuiInterfaceCall");