Relintai/sdl2_frt
1
0
Fork 0
mirror of https://github.com/Relintai/sdl2_frt.git synced 2025-01-17 14:47:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Emscripten: Use set_canvas_element_size

Browse Source 
This will be needed for supporting multiple canvases and set_canvas_size
is deprecated anyway.
This commit is contained in:
Charlie Birks 2019-01-29 12:18:56 +00:00
parent ed66a430c9
commit 8dab9c956f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/video/emscripten/SDL_emscriptenevents.c
View File

@ -604,7 +604,7 @@ Emscripten_HandleResize(int eventType, const EmscriptenUiEvent *uiEvent, void *u
emscripten_get_element_css_size(NULL, &w, &h); emscripten_get_element_css_size(NULL, &w, &h);
} }
emscripten_set_canvas_size(w * window_data->pixel_ratio, h * window_data->pixel_ratio); emscripten_set_canvas_element_size(NULL, w * window_data->pixel_ratio, h * window_data->pixel_ratio);
/* set_canvas_size unsets this */ /* set_canvas_size unsets this */
if (!window_data->external_size && window_data->pixel_ratio != 1.0f) { if (!window_data->external_size && window_data->pixel_ratio != 1.0f) {

6
src/video/emscripten/SDL_emscriptenvideo.c
View File

@ -207,7 +207,7 @@ Emscripten_CreateWindow(_THIS, SDL_Window * window)
scaled_h = SDL_floor(window->h * wdata->pixel_ratio); scaled_h = SDL_floor(window->h * wdata->pixel_ratio);
/* set a fake size to check if there is any CSS sizing the canvas */ /* set a fake size to check if there is any CSS sizing the canvas */
emscripten_set_canvas_size(1, 1); emscripten_set_canvas_element_size(NULL, 1, 1);
emscripten_get_element_css_size(NULL, &css_w, &css_h); emscripten_get_element_css_size(NULL, &css_w, &css_h);
wdata->external_size = SDL_floor(css_w) != 1 || SDL_floor(css_h) != 1; wdata->external_size = SDL_floor(css_w) != 1 || SDL_floor(css_h) != 1;
@ -220,7 +220,7 @@ Emscripten_CreateWindow(_THIS, SDL_Window * window)
SDL_SendWindowEvent(window, SDL_WINDOWEVENT_RESIZED, css_w, css_h); SDL_SendWindowEvent(window, SDL_WINDOWEVENT_RESIZED, css_w, css_h);
} }
emscripten_set_canvas_size(scaled_w, scaled_h); emscripten_set_canvas_element_size(NULL, scaled_w, scaled_h);
/* if the size is not being controlled by css, we need to scale down for hidpi */ /* if the size is not being controlled by css, we need to scale down for hidpi */
if (!wdata->external_size) { if (!wdata->external_size) {
@ -270,7 +270,7 @@ static void Emscripten_SetWindowSize(_THIS, SDL_Window * window)
if (window->flags & SDL_WINDOW_ALLOW_HIGHDPI) { if (window->flags & SDL_WINDOW_ALLOW_HIGHDPI) {
data->pixel_ratio = emscripten_get_device_pixel_ratio(); data->pixel_ratio = emscripten_get_device_pixel_ratio();
} }
emscripten_set_canvas_size(window->w * data->pixel_ratio, window->h * data->pixel_ratio); emscripten_set_canvas_element_size(NULL, window->w * data->pixel_ratio, window->h * data->pixel_ratio);
/*scale canvas down*/ /*scale canvas down*/
if (!data->external_size && data->pixel_ratio != 1.0f) { if (!data->external_size && data->pixel_ratio != 1.0f) {