diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-10-19 18:48:34 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-10-19 18:48:34 -0300 |
| commit | 2b12a8109dda1f47f9b75a5de91d7d00c1f25869 (patch) | |
| tree | 3f3775c304e76ea2776d336c9a471d99359872c0 /platform/x11 | |
| parent | 5d86a25f4d04b21559f0d4edbd4e70dc01ea6685 (diff) | |
| parent | 0a02c28b2be8e8271d5f3ffb95a4b09f91c3bd32 (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'platform/x11')
| -rw-r--r-- | platform/x11/os_x11.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index fe15dd5a08..85928f2815 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -784,8 +784,6 @@ void OS_X11::set_window_size(const Size2 p_size) { void OS_X11::set_window_fullscreen(bool p_enabled) { set_wm_fullscreen(p_enabled); current_videomode.fullscreen = p_enabled; - - visual_server->init(); } bool OS_X11::is_window_fullscreen() const { @@ -891,8 +889,14 @@ void OS_X11::set_window_maximized(bool p_enabled) { xev.xclient.data.l[2] = wm_max_vert; XSendEvent(x11_display, DefaultRootWindow(x11_display), False, SubstructureRedirectMask | SubstructureNotifyMask, &xev); - +/* sorry this does not fix it, fails on multi monitor + XWindowAttributes xwa; + XGetWindowAttributes(x11_display,DefaultRootWindow(x11_display),&xwa); + current_videomode.width = xwa.width; + current_videomode.height = xwa.height; +*/ maximized = p_enabled; + } bool OS_X11::is_window_maximized() const { @@ -1201,7 +1205,6 @@ void OS_X11::process_xevents() { #ifdef NEW_WM_API if(current_videomode.fullscreen) { set_wm_fullscreen(true); - visual_server->init(); } #endif main_loop->notification(MainLoop::NOTIFICATION_WM_FOCUS_IN); @@ -1218,7 +1221,6 @@ void OS_X11::process_xevents() { if(current_videomode.fullscreen) { set_wm_fullscreen(false); set_window_minimized(true); - visual_server->init(); } #endif main_loop->notification(MainLoop::NOTIFICATION_WM_FOCUS_OUT); |