seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions 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

11
platform/x11/os_x11.cpp
View File

@ -762,6 +762,10 @@ void OS_X11::set_current_screen(int p_screen) {
}
Point2 OS_X11::get_screen_position(int p_screen) const {
if (p_screen == -1) {
p_screen = get_current_screen();
}
// Using Xinerama Extension
int event_base, error_base;
const Bool ext_okay = XineramaQueryExtension(x11_display, &event_base, &error_base);
@ -783,6 +787,10 @@ Point2 OS_X11::get_screen_position(int p_screen) const {
}
Size2 OS_X11::get_screen_size(int p_screen) const {
if (p_screen == -1) {
p_screen = get_current_screen();
}
// Using Xinerama Extension
int event_base, error_base;
const Bool ext_okay = XineramaQueryExtension(x11_display, &event_base, &error_base);
@ -798,6 +806,9 @@ Size2 OS_X11::get_screen_size(int p_screen) const {
}
int OS_X11::get_screen_dpi(int p_screen) const {
if (p_screen == -1) {
p_screen = get_current_screen();
}
//invalid screen?
ERR_FAIL_INDEX_V(p_screen, get_screen_count(), 0);