igl | shell | Correctly handle desktop fullscreen mode on Windows

Summary: Correctly handle desktop fullscreen mode on Windows. Reviewed By: mmaurer Differential Revision: D62981405 fbshipit-source-id: 9b0f2c10d938237c6250735bbae026f0c8b35467
facebook · Sep 19, 2024 · ce8b7f1 · ce8b7f1
1 parent 8f305c6
commit ce8b7f1
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 10 deletions.
diff --git a/shell/windows/opengl/App.cpp b/shell/windows/opengl/App.cpp
@@ -146,16 +146,38 @@ GLFWwindow* initGLWindow(const shell::RenderSessionConfig& config) {
   glfwWindowHint(GLFW_DOUBLEBUFFER, true);
   glfwWindowHint(GLFW_RESIZABLE, true);
   glfwWindowHint(GLFW_SRGB_CAPABLE, true);
-  glfwWindowHint(GLFW_MAXIMIZED, config.screenMode != shell::ScreenMode::Windowed);
+
+  int posX = 0;
+  int posY = 0;
+  int width = config.width;
+  int height = config.height;
+
+  if (config.screenMode == shell::ScreenMode::FullscreenNoTaskbar) {
+    // render full screen without overlapping the task bar
+    GLFWmonitor* monitor = glfwGetPrimaryMonitor();
+    const GLFWvidmode* mode = glfwGetVideoMode(monitor);
+
+    glfwGetMonitorWorkarea(monitor, &posX, &posY, &width, &height);
+  } else if (config.screenMode == shell::ScreenMode::Fullscreen) {
+    glfwWindowHint(GLFW_MAXIMIZED, true);
+  }
 
   GLFWwindow* windowHandle =
-      glfwCreateWindow(config.width, config.height, config.displayName.c_str(), NULL, NULL);
+      glfwCreateWindow(width, height, config.displayName.c_str(), nullptr, nullptr);
   if (!windowHandle) {
     IGLLog(IGLLogError, "initGLWindow> we couldn't create the window");
     glfwTerminate();
     return nullptr;
   }
 
+  if (config.screenMode == shell::ScreenMode::FullscreenNoTaskbar) {
+    glfwSetWindowPos(windowHandle, posX, posY);
+  }
+
+  glfwGetFramebufferSize(windowHandle, &width, &height);
+  shellParams_.viewportSize.x = width;
+  shellParams_.viewportSize.y = height;
+
   int result = glfwGetWindowAttrib(windowHandle, GLFW_CLIENT_API);
 
   glfwMakeContextCurrent(windowHandle);
@@ -285,7 +307,7 @@ int main(int argc, char* argv[]) {
           .colorFramebufferFormat = TextureFormat::RGBA_SRGB,
           .width = 1024,
           .height = 768,
-          .screenMode = shell::ScreenMode::Windowed,
+          .screenMode = shell::ScreenMode::FullscreenNoTaskbar,
       },
   };
 

diff --git a/shell/windows/opengles/App.cpp b/shell/windows/opengles/App.cpp
@@ -106,15 +106,37 @@ GLFWwindow* initGLESWindow(const shell::RenderSessionConfig& config) {
   glfwWindowHint(GLFW_DOUBLEBUFFER, true);
   glfwWindowHint(GLFW_RESIZABLE, true);
   glfwWindowHint(GLFW_SRGB_CAPABLE, true);
-  glfwWindowHint(GLFW_MAXIMIZED, config.screenMode != shell::ScreenMode::Windowed);
+
+  int posX = 0;
+  int posY = 0;
+  int width = config.width;
+  int height = config.height;
+
+  if (config.screenMode == shell::ScreenMode::FullscreenNoTaskbar) {
+    // render full screen without overlapping the task bar
+    GLFWmonitor* monitor = glfwGetPrimaryMonitor();
+    const GLFWvidmode* mode = glfwGetVideoMode(monitor);
+
+    glfwGetMonitorWorkarea(monitor, &posX, &posY, &width, &height);
+  } else if (config.screenMode == shell::ScreenMode::Fullscreen) {
+    glfwWindowHint(GLFW_MAXIMIZED, true);
+  }
 
   GLFWwindow* windowHandle =
-      glfwCreateWindow(config.width, config.height, config.displayName.c_str(), NULL, NULL);
+      glfwCreateWindow(width, height, config.displayName.c_str(), nullptr, nullptr);
   if (!windowHandle) {
     glfwTerminate();
     return nullptr;
   }
 
+  if (config.screenMode == shell::ScreenMode::FullscreenNoTaskbar) {
+    glfwSetWindowPos(windowHandle, posX, posY);
+  }
+
+  glfwGetFramebufferSize(windowHandle, &width, &height);
+  shellParams_.viewportSize.x = width;
+  shellParams_.viewportSize.y = height;
+
   int result = glfwGetWindowAttrib(windowHandle, GLFW_CLIENT_API);
 
   glfwMakeContextCurrent(windowHandle);
@@ -192,7 +214,7 @@ int main(int argc, char* argv[]) {
           .colorFramebufferFormat = TextureFormat::RGBA_UNorm8,
           .width = 1024,
           .height = 768,
-          .screenMode = shell::ScreenMode::Windowed,
+          .screenMode = shell::ScreenMode::FullscreenNoTaskbar,
       },
   };
 

diff --git a/shell/windows/vulkan/App.cpp b/shell/windows/vulkan/App.cpp
@@ -83,16 +83,33 @@ GLFWwindow* initWindow(const shell::RenderSessionConfig& config) {
   glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
   glfwWindowHint(GLFW_RESIZABLE, GLFW_FALSE);
   glfwWindowHint(GLFW_SRGB_CAPABLE, GLFW_TRUE);
-  glfwWindowHint(GLFW_MAXIMIZED, config.screenMode != shell::ScreenMode::Windowed);
+
+  int posX = 0;
+  int posY = 0;
+  int width = config.width;
+  int height = config.height;
+
+  if (config.screenMode == shell::ScreenMode::FullscreenNoTaskbar) {
+    // render full screen without overlapping the task bar
+    GLFWmonitor* monitor = glfwGetPrimaryMonitor();
+    const GLFWvidmode* mode = glfwGetVideoMode(monitor);
+
+    glfwGetMonitorWorkarea(monitor, &posX, &posY, &width, &height);
+  } else if (config.screenMode == shell::ScreenMode::Fullscreen) {
+    glfwWindowHint(GLFW_MAXIMIZED, true);
+  }
 
   GLFWwindow* windowHandle =
-      glfwCreateWindow(config.width, config.height, config.displayName.c_str(), nullptr, nullptr);
+      glfwCreateWindow(width, height, config.displayName.c_str(), nullptr, nullptr);
   if (!windowHandle) {
     glfwTerminate();
     return nullptr;
   }
 
-  int width, height;
+  if (config.screenMode == shell::ScreenMode::FullscreenNoTaskbar) {
+    glfwSetWindowPos(windowHandle, posX, posY);
+  }
+
   glfwGetFramebufferSize(windowHandle, &width, &height);
   shellParams_.viewportSize.x = width;
   shellParams_.viewportSize.y = height;
@@ -207,7 +224,7 @@ int main(int argc, char* argv[]) {
           .colorFramebufferFormat = TextureFormat::BGRA_UNorm8,
           .width = 1024,
           .height = 768,
-          .screenMode = shell::ScreenMode::Windowed,
+          .screenMode = shell::ScreenMode::FullscreenNoTaskbar,
       },
   };