Add constant for minimum window size

Author: Flamefire

libs/driver/include/driver/VideoMode.h

@@ -10,10 +10,10 @@ struct VideoMode
     unsigned short width;
     unsigned short height;
 
-    VideoMode() : width(0), height(0) {}
-    VideoMode(unsigned short width, unsigned short height) : width(width), height(height) {}
-    bool operator==(const VideoMode& o) const { return (width == o.width && height == o.height); }
-    bool operator!=(const VideoMode& o) const { return !(*this == o); }
+    constexpr VideoMode() : width(0), height(0) {}
+    constexpr VideoMode(unsigned short width, unsigned short height) : width(width), height(height) {}
+    constexpr bool operator==(const VideoMode& o) const { return (width == o.width && height == o.height); }
+    constexpr bool operator!=(const VideoMode& o) const { return !(*this == o); }
 };
 
 // Enum like type with extra flag

libs/s25main/Settings.cpp

@@ -96,13 +96,14 @@ void Settings::LoadDefaults()
     // {
     if(VIDEODRIVER.IsLoaded())
     {
-        video.fullscreenSize = VIDEODRIVER.GetWindowSize();
-        video.windowedSize =
-          (VIDEODRIVER.GetDisplayMode() == DisplayMode::Fullscreen) ? video.fullscreenSize : VideoMode(800, 600);
+        video.fullscreenSize = (VIDEODRIVER.GetDisplayMode() == DisplayMode::Fullscreen) ? VIDEODRIVER.GetWindowSize() :
+                                                                                           VIDEODRIVER.MinWindowSize;
+        video.windowedSize = (VIDEODRIVER.GetDisplayMode() == DisplayMode::Windowed) ? VIDEODRIVER.GetWindowSize() :
+                                                                                       VIDEODRIVER.MinWindowSize;
         video.displayMode = VIDEODRIVER.GetDisplayMode();
     } else
     {
-        video.windowedSize = video.fullscreenSize = VideoMode(800, 600);
+        video.windowedSize = video.fullscreenSize = VIDEODRIVER.MinWindowSize;
         video.displayMode = DisplayMode::Windowed;
     }
     video.framerate = 0; // Special value for HW vsync

libs/s25main/WindowManager.cpp

@@ -412,7 +412,8 @@ void WindowManager::Msg_ScreenResize(const Extent& newSize)
     if(newSize == curRenderSize)
         return;
 
-    ScreenResizeEvent sr(curRenderSize, elMax(Extent(800, 600), newSize));
+    constexpr Extent minSize(VideoDriverWrapper::MinWindowSize.width, VideoDriverWrapper::MinWindowSize.height);
+    ScreenResizeEvent sr(curRenderSize, elMax(minSize, newSize));
     curRenderSize = sr.newSize;
 
     // Don't change fullscreen size (only in menu)

libs/s25main/drivers/VideoDriverWrapper.cpp

@@ -435,7 +435,8 @@ std::vector<VideoMode> VideoDriverWrapper::ListVideoModes() const
 
     auto videoModes = videodriver->ListVideoModes();
     // Remove everything below 800x600
-    helpers::erase_if(videoModes, [](const auto& m) { return m.width < 800 && m.height < 600; });
+    helpers::erase_if(videoModes,
+                      [](const auto& m) { return m.width < MinWindowSize.width && m.height < MinWindowSize.height; });
     return videoModes;
 }
 
@@ -465,10 +466,10 @@ void* VideoDriverWrapper::GetMapPointer() const
 
 VideoMode VideoDriverWrapper::GetWindowSize() const
 {
-    // Always return at least 800x600 even if real window is smaller
+    // Always return at least MinWindowSize even if real window is smaller
     VideoMode windowSize = videodriver->GetWindowSize();
-    windowSize.width = std::max<unsigned>(800, windowSize.width);
-    windowSize.height = std::max<unsigned>(600, windowSize.height);
+    windowSize.width = std::max(MinWindowSize.width, windowSize.width);
+    windowSize.height = std::max(MinWindowSize.height, windowSize.height);
     return windowSize;
 }
 

libs/s25main/drivers/VideoDriverWrapper.h

@@ -111,6 +111,8 @@ class VideoDriverWrapper : public Singleton<VideoDriverWrapper, SingletonPolicie
     /// Calculate the size of the texture which is optimal for the driver and at least minSize
     Extent calcPreferredTextureSize(const Extent& minSize) const;
 
+    static constexpr VideoMode MinWindowSize{800, 600};
+
 private:
     bool Initialize();
     bool setHwVSync(bool enabled);