diff options
| author | Rémi Verschelde | 2017-08-22 08:12:04 +0200 |
|---|---|---|
| committer | GitHub | 2017-08-22 08:12:04 +0200 |
| commit | 7f49e2a7a0e74b7de98c4cb176f333f78d6c0e50 (patch) | |
| tree | cde824812428078fa0c258b6a9204c6186f6cec9 /platform/javascript | |
| parent | 4fc0a2d776cc26a0b372af4c345ccc0f44e47105 (diff) | |
| parent | 63f847b3065bb7c7a130a199731b4d92a7bdfb91 (diff) | |
| download | godot-7f49e2a7a0e74b7de98c4cb176f333f78d6c0e50.tar.gz godot-7f49e2a7a0e74b7de98c4cb176f333f78d6c0e50.tar.zst godot-7f49e2a7a0e74b7de98c4cb176f333f78d6c0e50.zip | |
Merge pull request #10487 from marcelofg55/curscr_as_default
p_screen param from get_screen_* funcs now default to the current screen
Diffstat (limited to 'platform/javascript')
| -rw-r--r-- | platform/javascript/os_javascript.cpp | 2 | ||||
| -rw-r--r-- | platform/javascript/os_javascript.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/platform/javascript/os_javascript.cpp b/platform/javascript/os_javascript.cpp index d339baf02..f49acb04d 100644 --- a/platform/javascript/os_javascript.cpp +++ b/platform/javascript/os_javascript.cpp @@ -687,8 +687,6 @@ OS::VideoMode OS_JavaScript::get_video_mode(int p_screen) const { Size2 OS_JavaScript::get_screen_size(int p_screen) const { - ERR_FAIL_COND_V(p_screen != 0, Size2()); - EmscriptenFullscreenChangeEvent ev; EMSCRIPTEN_RESULT result = emscripten_get_fullscreen_status(&ev); ERR_FAIL_COND_V(result != EMSCRIPTEN_RESULT_SUCCESS, Size2()); diff --git a/platform/javascript/os_javascript.h b/platform/javascript/os_javascript.h index 13c500b3d..ff484204c 100644 --- a/platform/javascript/os_javascript.h +++ b/platform/javascript/os_javascript.h @@ -124,7 +124,7 @@ public: virtual VideoMode get_video_mode(int p_screen = 0) const; virtual void get_fullscreen_mode_list(List<VideoMode> *p_list, int p_screen = 0) const; - virtual Size2 get_screen_size(int p_screen = 0) const; + virtual Size2 get_screen_size(int p_screen = -1) const; virtual void set_window_size(const Size2); virtual Size2 get_window_size() const; |