godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-05 06:11:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

p_screen param from get_screen_* funcs now default to the current screen

Browse Source
This commit is contained in:
Marcelo Fernandez
2017-08-20 16:12:29 -03:00
parent f6c39830cb
commit 63f847b306
12 changed files with 47 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/javascript/os_javascript.cpp
View File

@@ -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());

2
platform/javascript/os_javascript.h
View File

@@ -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;