Skip to content

DPI scaling supported added to the DLL #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
LeonSparta wants to merge 1 commit into from
Closed

DPI scaling supported added to the DLL #79

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions ui_api.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -893,10 +893,11 @@ static int l_DrawImage(lua_State* L)
}

if (af & AF_XY) {
const float dpiScale = ui->renderer->VirtualScreenScaleFactor();
for (int i = k; i < k + 4; i++) {
ui->LAssert(L, lua_isnumber(L, i), "DrawImage() argument %d: expected number, got %s", i, luaL_typename(L, i));
const int idx = i - k;
xys[idx/2][idx%2] = (float)lua_tonumber(L, i);
xys[idx/2][idx%2] = (float)lua_tonumber(L, i) * dpiScale;
}
k += 4;
}
Expand Down Expand Up @@ -1061,9 +1062,15 @@ static int l_DrawString(lua_State* L)
ui->LAssert(L, lua_isstring(L, 6), "DrawString() argument 6: expected string, got %s", luaL_typename(L, 6));
static const char* alignMap[6] = { "LEFT", "CENTER", "RIGHT", "CENTER_X", "RIGHT_X", NULL };
static const char* fontMap[4] = { "FIXED", "VAR", "VAR BOLD", NULL };
const float dpiScale = ui->renderer->VirtualScreenScaleFactor();
ui->renderer->DrawString(
(float)lua_tonumber(L, 1), (float)lua_tonumber(L, 2), luaL_checkoption(L, 3, "LEFT", alignMap),
(int)lua_tointeger(L, 4), NULL, luaL_checkoption(L, 5, "FIXED", fontMap), lua_tostring(L, 6)
(float)lua_tonumber(L, 1) * dpiScale,
(float)lua_tonumber(L, 2) * dpiScale,
luaL_checkoption(L, 3, "LEFT", alignMap),
(int)lua_tointeger(L, 4) * dpiScale,
NULL,
luaL_checkoption(L, 5, "FIXED", fontMap),
lua_tostring(L, 6)
);
return 0;
}
Expand All @@ -1078,7 +1085,10 @@ static int l_DrawStringWidth(lua_State* L)
ui->LAssert(L, lua_isstring(L, 2), "DrawStringWidth() argument 2: expected string, got %s", luaL_typename(L, 2));
ui->LAssert(L, lua_isstring(L, 3), "DrawStringWidth() argument 3: expected string, got %s", luaL_typename(L, 3));
static const char* fontMap[4] = { "FIXED", "VAR", "VAR BOLD", NULL };
lua_pushinteger(L, ui->renderer->DrawStringWidth((int)lua_tointeger(L, 1), luaL_checkoption(L, 2, "FIXED", fontMap), lua_tostring(L, 3)));
const float dpiScale = ui->renderer->VirtualScreenScaleFactor();
lua_pushinteger(L, ui->renderer->DrawStringWidth((int)lua_tointeger(L, 1) * dpiScale,
luaL_checkoption(L, 2, "FIXED", fontMap),
lua_tostring(L, 3)) / dpiScale);
return 1;
}

Expand Down
Loading