Skip to content

Replace test uses of deprecated canvas_size functions #8738

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
wants to merge 6 commits into from
Closed

Replace test uses of deprecated canvas_size functions #8738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7eb8a5c
Replace uses of deprecated canvas_size functions
VirtualTim Jun 4, 2019
8e8ce4b
Replace more uses of deprecated canvas_size functions
VirtualTim Jun 4, 2019
b0998a8
Forgot to also rename the function
VirtualTim Jun 4, 2019
1d778c3
Forgot to also rename the function
VirtualTim Jun 4, 2019
6afde5d
Include html5 header
VirtualTim Jun 4, 2019
37c8303
Include html5 header (part2)
VirtualTim Jun 4, 2019
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
9 changes: 5 additions & 4 deletions tests/sdl_canvas_size.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include <assert.h>

#include <emscripten.h>
#include <emscripten/html5.h>

int main(int argc, char *argv[])
{
Expand All @@ -29,15 +30,15 @@ int main(int argc, char *argv[])
screen = SDL_SetVideoMode( 0, 0, 16, SDL_OPENGL ); // *changed*

// Test 2: Check that getting current canvas size works.
int w, h, fs;
emscripten_get_canvas_size(&w, &h, &fs);
int w, h;
emscripten_get_canvas_element_size("#canvas", &w, &h);
printf("w:%d,h:%d\n", w,h);
assert(w == 700);
assert(h == 200);

// Test 3: Check that resizing the canvas works as well.
emscripten_set_canvas_size(640, 480);
emscripten_get_canvas_size(&w, &h, &fs);
emscripten_set_canvas_element_size("#canvas", 640, 480);
emscripten_get_canvas_element_size("#canvas", &w, &h);
printf("w:%d,h:%d\n", w,h);
assert(w == 640);
assert(h == 480);
Expand Down
5 changes: 3 additions & 2 deletions tests/sdl_resize.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include <SDL/SDL_ttf.h>
#include <assert.h>
#include <emscripten.h>
#include <emscripten/html5.h>

int stage = 0;

Expand All @@ -24,7 +25,7 @@ void loop() {
case 0:
assert(r->w == 100);
assert(r->h == 200);
emscripten_set_canvas_size(123, 246);
emscripten_set_canvas_element_size("#canvas", 123, 246);
stage++;
break;
case 1:
Expand All @@ -44,7 +45,7 @@ int main() {
SDL_Init(SDL_INIT_VIDEO);
SDL_Surface *screen = SDL_SetVideoMode(600, 450, 32, SDL_HWSURFACE);

emscripten_set_canvas_size(100, 200);
emscripten_set_canvas_element_size("#canvas", 100, 200);

emscripten_set_main_loop(loop, 0, 0);
}
Expand Down