mirror of
https://gitea.wildfiregames.com/0ad/0ad
synced 2026-06-16 05:13:58 -07:00
f9b529f2fb
f0d9806b3fadded a problem: Engine.GetGuiObjectByName is unaware of the caller GUI page. So GUI pages in the background that still run the onTick and other event code tried to look on the topmost GUI page, rather than their own GUI page.9674c3c0feadded a workaround that has to be copied to any place that can call JS code. If developers don't know about the reason for this workaround and add a new place that can call JS code (#5369), they won't be able to implement anything. This removes this workaround by passing the pointer to the correct GUI page as callback data. Patch By: elexis Reviewed By: wraitii Refs #5369 Trac Tickets: #5369 Differential Revision: https://code.wildfiregames.com/D1701 This was SVN commit r22200.
94 lines
3.5 KiB
C++
94 lines
3.5 KiB
C++
/* Copyright (C) 2018 Wildfire Games.
|
|
* This file is part of 0 A.D.
|
|
*
|
|
* 0 A.D. is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* 0 A.D. is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with 0 A.D. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "precompiled.h"
|
|
|
|
#include "JSInterface_GUIManager.h"
|
|
|
|
#include "gui/CGUI.h"
|
|
#include "gui/GUIManager.h"
|
|
#include "gui/IGUIObject.h"
|
|
#include "ps/GameSetup/Config.h"
|
|
#include "scriptinterface/ScriptInterface.h"
|
|
|
|
// Note that the initData argument may only contain clonable data.
|
|
// Functions aren't supported for example!
|
|
void JSI_GUIManager::PushGuiPage(ScriptInterface::CxPrivate* pCxPrivate, const std::wstring& name, JS::HandleValue initData)
|
|
{
|
|
g_GUI->PushPage(name, pCxPrivate->pScriptInterface->WriteStructuredClone(initData));
|
|
}
|
|
|
|
void JSI_GUIManager::SwitchGuiPage(ScriptInterface::CxPrivate* pCxPrivate, const std::wstring& name, JS::HandleValue initData)
|
|
{
|
|
g_GUI->SwitchPage(name, pCxPrivate->pScriptInterface, initData);
|
|
}
|
|
|
|
void JSI_GUIManager::PopGuiPage(ScriptInterface::CxPrivate* UNUSED(pCxPrivate))
|
|
{
|
|
g_GUI->PopPage();
|
|
}
|
|
|
|
void JSI_GUIManager::PopGuiPageCB(ScriptInterface::CxPrivate* pCxPrivate, JS::HandleValue args)
|
|
{
|
|
g_GUI->PopPageCB(pCxPrivate->pScriptInterface->WriteStructuredClone(args));
|
|
}
|
|
|
|
JS::Value JSI_GUIManager::GetGUIObjectByName(ScriptInterface::CxPrivate* pCxPrivate, const std::string& name)
|
|
{
|
|
CGUI* guiPage = static_cast<CGUI*>(pCxPrivate->pCBData);
|
|
|
|
IGUIObject* guiObj = guiPage->FindObjectByName(name);
|
|
if (!guiObj)
|
|
return JS::UndefinedValue();
|
|
|
|
return JS::ObjectValue(*guiObj->GetJSObject());
|
|
}
|
|
|
|
std::wstring JSI_GUIManager::SetCursor(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), const std::wstring& name)
|
|
{
|
|
std::wstring old = g_CursorName;
|
|
g_CursorName = name;
|
|
return old;
|
|
}
|
|
|
|
void JSI_GUIManager::ResetCursor(ScriptInterface::CxPrivate* UNUSED(pCxPrivate))
|
|
{
|
|
g_GUI->ResetCursor();
|
|
}
|
|
|
|
bool JSI_GUIManager::TemplateExists(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), const std::string& templateName)
|
|
{
|
|
return g_GUI->TemplateExists(templateName);
|
|
}
|
|
|
|
CParamNode JSI_GUIManager::GetTemplate(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), const std::string& templateName)
|
|
{
|
|
return g_GUI->GetTemplate(templateName);
|
|
}
|
|
|
|
void JSI_GUIManager::RegisterScriptFunctions(const ScriptInterface& scriptInterface)
|
|
{
|
|
scriptInterface.RegisterFunction<void, std::wstring, JS::HandleValue, &PushGuiPage>("PushGuiPage");
|
|
scriptInterface.RegisterFunction<void, std::wstring, JS::HandleValue, &SwitchGuiPage>("SwitchGuiPage");
|
|
scriptInterface.RegisterFunction<void, &PopGuiPage>("PopGuiPage");
|
|
scriptInterface.RegisterFunction<void, JS::HandleValue, &PopGuiPageCB>("PopGuiPageCB");
|
|
scriptInterface.RegisterFunction<JS::Value, std::string, &GetGUIObjectByName>("GetGUIObjectByName");
|
|
scriptInterface.RegisterFunction<std::wstring, std::wstring, &SetCursor>("SetCursor");
|
|
scriptInterface.RegisterFunction<void, &ResetCursor>("ResetCursor");
|
|
scriptInterface.RegisterFunction<bool, std::string, &TemplateExists>("TemplateExists");
|
|
scriptInterface.RegisterFunction<CParamNode, std::string, &GetTemplate>("GetTemplate");
|
|
}
|