Merge pull request #21330 from eska014/html5-canvas-resize

Facilitate external modification of HTML5 canvas size
This commit is contained in:
Rémi Verschelde 2018-08-23 21:48:27 +02:00 committed by GitHub
commit b90dff787c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 63 additions and 59 deletions

View file

@ -44,8 +44,8 @@ class OS_JavaScript : public OS_Unix {
VideoMode video_mode;
Vector2 windowed_size;
bool window_maximized;
bool soft_fullscreen_enabled;
bool canvas_size_adjustment_requested;
bool entering_fullscreen;
bool just_exited_fullscreen;
InputDefault *input;
Ref<InputEventKey> deferred_key_event;
@ -59,7 +59,6 @@ class OS_JavaScript : public OS_Unix {
int64_t sync_wait_time;
int64_t last_sync_check_time;
static EM_BOOL browser_resize_callback(int p_event_type, const EmscriptenUiEvent *p_event, void *p_user_data);
static EM_BOOL fullscreen_change_callback(int p_event_type, const EmscriptenFullscreenChangeEvent *p_event, void *p_user_data);
static EM_BOOL keydown_callback(int p_event_type, const EmscriptenKeyboardEvent *p_event, void *p_user_data);