chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

Revert "Script: Extend Measure:GetStringValue to support a parameter table"

Browse Source 
This reverts commit b0d101e.
This commit is contained in:
Birunthan Mohanathas 2013-06-10 18:19:33 +03:00
parent b0d101ed71
commit 68430b54db
1 changed files with 5 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
Library/lua/glue/LuaMeasure.cpp
View File

@ -120,59 +120,11 @@ static int GetStringValue(lua_State* L)
{ {
DECLARE_SELF(L) DECLARE_SELF(L)
AUTOSCALE autoScale = AUTOSCALE_OFF; int top = lua_gettop(L);
double scale = 1.0; AUTOSCALE autoScale = (top > 1) ? (AUTOSCALE)(int)lua_tonumber(L, 2) : AUTOSCALE_OFF;
int decimals = 0; double scale = (top > 2) ? lua_tonumber(L, 3) : 1.0;
bool percentual = false; int decimals = (int)lua_tonumber(L, 4);
bool percentual = lua_toboolean(L, 5);
const int top = lua_gettop(L);
if (top == 2 && lua_istable(L, 2))
{
lua_pushvalue(L, 2);
lua_pushnil(L);
// Stack: nil, table, ...
while (lua_next(L, -2))
{
// Stack: value, key, table, ...
// Push copy of key to avoid changing orignal key.
lua_pushvalue(L, -2);
// Stack: key, value, key, table, ...
const char* key = lua_tostring(L, -1);
if (strcmp(key, "AutoScale") == 0)
{
// TODO: Implement something more reliable than casting.
autoScale = (AUTOSCALE)(int)lua_tonumber(L, -2);
}
else if (strcmp(key, "Scale") == 0)
{
scale = lua_tonumber(L, -2);
}
else if (strcmp(key, "NumOfDecimals") == 0)
{
decimals = (int)lua_tonumber(L, -2);
}
else if (strcmp(key, "Percentual") == 0)
{
percentual = lua_toboolean(L, -2);
}
lua_pop(L, 2);
// Stack: key, table, ...
}
// Stack: table, ...
lua_pop(L, 1);
}
else
{
// For backwards compatibility.
if (top > 1) autoScale = (AUTOSCALE)(int)lua_tonumber(L, 2);
if (top > 2) scale = lua_tonumber(L, 3);
if (top > 3) decimals = (int)lua_tonumber(L, 4);
if (top > 4) percentual = lua_toboolean(L, 5);
}
const WCHAR* val = self->GetStringOrFormattedValue(autoScale, scale, decimals, percentual); const WCHAR* val = self->GetStringOrFormattedValue(autoScale, scale, decimals, percentual);
LuaManager::PushWide(L, val); LuaManager::PushWide(L, val);