Merge branch 'master' of https://github.com/highfidelity/hifi into tot

This commit is contained in:
Sam Gateau 2014-12-02 13:49:28 -08:00
commit 8b75272cde

View file

@ -1574,8 +1574,10 @@ void Application::setFullscreen(bool fullscreen) {
} }
_window->setWindowState(fullscreen ? (_window->windowState() | Qt::WindowFullScreen) : _window->setWindowState(fullscreen ? (_window->windowState() | Qt::WindowFullScreen) :
(_window->windowState() & ~Qt::WindowFullScreen)); (_window->windowState() & ~Qt::WindowFullScreen));
if (!_aboutToQuit) {
_window->show(); _window->show();
} }
}
void Application::setEnable3DTVMode(bool enable3DTVMode) { void Application::setEnable3DTVMode(bool enable3DTVMode) {
resizeGL(_glWidget->getDeviceWidth(),_glWidget->getDeviceHeight()); resizeGL(_glWidget->getDeviceWidth(),_glWidget->getDeviceHeight());