rein: smarter GetDPI

hugeping · Oct 23, 2023 · e2de808 · e2de808
1 parent 9c40fb4
commit e2de808
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/main.c b/src/main.c
@@ -162,14 +162,14 @@ main(int argc, const char **argv)
 	lua_pushstring(L, GetLanguage());
 	lua_setglobal(L, "LANGUAGE");
 
-	lua_pushnumber(L, GetScale());
-	lua_setglobal(L, "SCALE");
-
 	if (WindowCreate()) {
 		fprintf(stderr, "Can not create window!\n");
 		return 1;
 	}
 
+	lua_pushnumber(L, GetScale());
+	lua_setglobal(L, "SCALE");
+
 	for (i = 0; lua_libs[i].name; i++)
 		luaL_requiref(L, lua_libs[i].name, lua_libs[i].func, 1);
 

diff --git a/src/platform.c b/src/platform.c
@@ -206,7 +206,8 @@ GetScale(void)
 	return (float)r;
 #else
 	float dpi;
-	if (SDL_GetDisplayDPI(0, NULL, &dpi, NULL))
+	int disp = window?SDL_GetWindowDisplayIndex(window):0;
+	if (SDL_GetDisplayDPI(disp, NULL, &dpi, NULL))
 		return 1.0f;
 	return dpi / 96.0f;
 #endif