forked from 0ad/0ad
wraitii
d07f271d60
Two noteworthy changes:
- Proxies are update to the SM60 API, having an explicit reserved slot
and a private slot, in which the 'proxy data' and the C++ object are
stored. This fixes a debug assertion failure of SM52 (See bugs 1237504
and 1339411)
- The GC callback behaviour has changed slightly, and we should now only
look for GC_SLICE_BEGIN and GC_SLICE_END calls (Bug 1364547)
Other updates are minor:
- Bug 1339036: JSTYPE_VOID beomes JSTYPE_UNDEFINED
- Bug 1308236 - avoid ambiguous comparison by changing NULL to nullptr
- Bug 1421358, GC::reason::REFRESH_FRAME was removed. API is indicated
in jsapi.h so use that.
- Compartment behaviours update
- ClassOps changes (Bug 1389510 removed the getter/setter - 7c04ea0211 -
and bug 1370608 added one more before that so net minus one)
- Minor tests touchups again.
Tested by: SubitaNeo, Stan
Thanks to bellaz89 for the Shared Array fix
Closes #5859
Differential Revision: https://code.wildfiregames.com/D3116
This was SVN commit r24243.
130 lines
4.0 KiB
C++
130 lines
4.0 KiB
C++
/* Copyright (C) 2020 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_GUISize.h"
|
|
|
|
#include "ps/CStr.h"
|
|
#include "scriptinterface/ScriptInterface.h"
|
|
|
|
JSClass JSI_GUISize::JSI_class = {
|
|
"GUISize", 0, &JSI_GUISize::JSI_classops
|
|
};
|
|
|
|
JSClassOps JSI_GUISize::JSI_classops = {
|
|
nullptr, nullptr,
|
|
nullptr, nullptr,
|
|
nullptr, nullptr, nullptr, nullptr,
|
|
nullptr, JSI_GUISize::construct, nullptr
|
|
};
|
|
|
|
JSFunctionSpec JSI_GUISize::JSI_methods[] =
|
|
{
|
|
JS_FN("toString", JSI_GUISize::toString, 0, 0),
|
|
JS_FS_END
|
|
};
|
|
|
|
void JSI_GUISize::RegisterScriptClass(ScriptInterface& scriptInterface)
|
|
{
|
|
scriptInterface.DefineCustomObjectType(&JSI_GUISize::JSI_class, JSI_GUISize::construct, 0, nullptr, JSI_GUISize::JSI_methods, nullptr, nullptr);
|
|
}
|
|
|
|
bool JSI_GUISize::construct(JSContext* cx, uint argc, JS::Value* vp)
|
|
{
|
|
JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
|
|
ScriptInterface* pScriptInterface = ScriptInterface::GetScriptInterfaceAndCBData(cx)->pScriptInterface;
|
|
ScriptRequest rq(*pScriptInterface);
|
|
|
|
JS::RootedObject obj(rq.cx, pScriptInterface->CreateCustomObject("GUISize"));
|
|
|
|
if (args.length() == 8)
|
|
{
|
|
JS_SetProperty(rq.cx, obj, "left", args[0]);
|
|
JS_SetProperty(rq.cx, obj, "top", args[1]);
|
|
JS_SetProperty(rq.cx, obj, "right", args[2]);
|
|
JS_SetProperty(rq.cx, obj, "bottom", args[3]);
|
|
JS_SetProperty(rq.cx, obj, "rleft", args[4]);
|
|
JS_SetProperty(rq.cx, obj, "rtop", args[5]);
|
|
JS_SetProperty(rq.cx, obj, "rright", args[6]);
|
|
JS_SetProperty(rq.cx, obj, "rbottom", args[7]);
|
|
}
|
|
else if (args.length() == 4)
|
|
{
|
|
JS::RootedValue zero(rq.cx, JS::NumberValue(0));
|
|
JS_SetProperty(rq.cx, obj, "left", args[0]);
|
|
JS_SetProperty(rq.cx, obj, "top", args[1]);
|
|
JS_SetProperty(rq.cx, obj, "right", args[2]);
|
|
JS_SetProperty(rq.cx, obj, "bottom", args[3]);
|
|
JS_SetProperty(rq.cx, obj, "rleft", zero);
|
|
JS_SetProperty(rq.cx, obj, "rtop", zero);
|
|
JS_SetProperty(rq.cx, obj, "rright", zero);
|
|
JS_SetProperty(rq.cx, obj, "rbottom", zero);
|
|
}
|
|
else
|
|
{
|
|
JS::RootedValue zero(rq.cx, JS::NumberValue(0));
|
|
JS_SetProperty(rq.cx, obj, "left", zero);
|
|
JS_SetProperty(rq.cx, obj, "top", zero);
|
|
JS_SetProperty(rq.cx, obj, "right", zero);
|
|
JS_SetProperty(rq.cx, obj, "bottom", zero);
|
|
JS_SetProperty(rq.cx, obj, "rleft", zero);
|
|
JS_SetProperty(rq.cx, obj, "rtop", zero);
|
|
JS_SetProperty(rq.cx, obj, "rright", zero);
|
|
JS_SetProperty(rq.cx, obj, "rbottom", zero);
|
|
}
|
|
|
|
args.rval().setObject(*obj);
|
|
return true;
|
|
}
|
|
|
|
// Produces "10", "-10", "50%", "50%-10", "50%+10", etc
|
|
CStr JSI_GUISize::ToPercentString(double pix, double per)
|
|
{
|
|
if (per == 0)
|
|
return CStr::FromDouble(pix);
|
|
|
|
return CStr::FromDouble(per)+"%"+(pix == 0.0 ? CStr() : pix > 0.0 ? CStr("+")+CStr::FromDouble(pix) : CStr::FromDouble(pix));
|
|
}
|
|
|
|
bool JSI_GUISize::toString(JSContext* cx, uint argc, JS::Value* vp)
|
|
{
|
|
JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
|
|
CStr buffer;
|
|
|
|
ScriptInterface* pScriptInterface = ScriptInterface::GetScriptInterfaceAndCBData(cx)->pScriptInterface;
|
|
ScriptRequest rq(*pScriptInterface);
|
|
double val, valr;
|
|
|
|
#define SIDE(side) \
|
|
pScriptInterface->GetProperty(args.thisv(), #side, val); \
|
|
pScriptInterface->GetProperty(args.thisv(), "r"#side, valr); \
|
|
buffer += ToPercentString(val, valr);
|
|
|
|
SIDE(left);
|
|
buffer += " ";
|
|
SIDE(top);
|
|
buffer += " ";
|
|
SIDE(right);
|
|
buffer += " ";
|
|
SIDE(bottom);
|
|
#undef SIDE
|
|
|
|
ScriptInterface::ToJSVal(rq, args.rval(), buffer);
|
|
return true;
|
|
}
|