Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adapte multi monitors

This commit is contained in:
halx99 2020-08-03 10:33:04 +08:00
parent f396ba9983
commit 6fd4d6e4ab
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cocos/platform/desktop/CCGLViewImpl-desktop.cpp
View File

@ -649,13 +649,11 @@ void GLViewImpl::setFullscreen()
} }
void GLViewImpl::setFullscreen(int w, int h, int refreshRate) { void GLViewImpl::setFullscreen(int w, int h, int refreshRate) {
if (this->isFullscreen()) auto monitor = glfwGetPrimaryMonitor();
return; if (nullptr == monitor || monitor == _monitor) {
_monitor = glfwGetPrimaryMonitor();
if (nullptr == _monitor) {
return; return;
} }
this->setFullscreen(_monitor, w, h, refreshRate); this->setFullscreen(monitor, w, h, refreshRate);
} }
void GLViewImpl::setFullscreen(int monitorIndex) void GLViewImpl::setFullscreen(int monitorIndex)
@ -664,15 +662,13 @@ void GLViewImpl::setFullscreen(int monitorIndex)
} }
void GLViewImpl::setFullscreen(int monitorIndex, int w, int h, int refreshRate) { void GLViewImpl::setFullscreen(int monitorIndex, int w, int h, int refreshRate) {
if (this->isFullscreen())
return;
int count = 0; int count = 0;
GLFWmonitor** monitors = glfwGetMonitors(&count); GLFWmonitor** monitors = glfwGetMonitors(&count);
if (monitorIndex < 0 || monitorIndex >= count) { if (monitorIndex < 0 || monitorIndex >= count) {
return; return;
} }
GLFWmonitor* monitor = monitors[monitorIndex]; GLFWmonitor* monitor = monitors[monitorIndex];
if (nullptr == monitor) { if (nullptr == monitor || _monitor == monitor) {
return; return;
} }
this->setFullscreen(monitor, w, h, refreshRate); this->setFullscreen(monitor, w, h, refreshRate);