Make VideoMode sortable and return as std::set

Author: Flamefire

libs/driver/include/driver/VideoMode.h

@@ -14,6 +14,16 @@ struct VideoMode
     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); }
+    constexpr bool operator<(const VideoMode& o) const
+    {
+        const auto area = static_cast<unsigned>(width) * height;
+        const auto otherArea = static_cast<unsigned>(o.width) * o.height;
+        if(area != otherArea)
+            return area < otherArea;
+        if(width != o.width)
+            return width < o.width;
+        return height < o.height;
+    }
 };
 
 // Enum like type with extra flag

libs/s25main/desktops/dskOptions.cpp

@@ -755,22 +755,14 @@ void dskOptions::Msg_MsgBoxResult(const unsigned msgbox_id, const MsgboxResult /
     }
 }
 
-static bool cmpVideoModes(const VideoMode& left, const VideoMode& right)
-{
-    if(left.width == right.width)
-        return left.height > right.height;
-    else
-        return left.width > right.width;
-}
-
 void dskOptions::loadVideoModes()
 {
     // Get available modes
-    videoModes_ = VIDEODRIVER.ListVideoModes();
-    // Sort by aspect ratio
-    helpers::sort(videoModes_, cmpVideoModes);
-    windowSizes_ = VIDEODRIVER.GetDefaultWindowSizes();
-    std::sort(windowSizes_.begin(), windowSizes_.end(), cmpVideoModes);
+    const auto videoModes = VIDEODRIVER.ListVideoModes();
+    // random access is need for selection
+    videoModes_.assign(videoModes.begin(), videoModes.end());
+    const auto windowSizes = VIDEODRIVER.GetDefaultWindowSizes();
+    windowSizes_.assign(windowSizes.begin(), windowSizes.end());
 }
 
 void dskOptions::Msg_ScreenResize(const ScreenResizeEvent& sr)

libs/s25main/drivers/VideoDriverWrapper.cpp

@@ -428,22 +428,23 @@ void VideoDriverWrapper::SetMousePos(const Position& newPos)
     videodriver->SetMousePos(newPos);
 }
 
-std::vector<VideoMode> VideoDriverWrapper::ListVideoModes() const
+std::set<VideoMode> VideoDriverWrapper::ListVideoModes() const
 {
     if(!videodriver)
         return {};
 
-    auto videoModes = videodriver->ListVideoModes();
-    // Remove everything below 800x600
-    helpers::erase_if(videoModes,
-                      [](const auto& m) { return m.width < MinWindowSize.width && m.height < MinWindowSize.height; });
-    return videoModes;
+    const auto videoModes = videodriver->ListVideoModes();
+    std::set<VideoMode> result;
+    // Keep only modes larger than the minimum
+    std::copy_if(videoModes.begin(), videoModes.end(), std::inserter(result, result.end()),
+                 [](const auto& m) { return m.width >= MinWindowSize.width || m.height >= MinWindowSize.height; });
+    return result;
 }
 
-std::vector<VideoMode> VideoDriverWrapper::GetDefaultWindowSizes() const
+std::set<VideoMode> VideoDriverWrapper::GetDefaultWindowSizes() const
 {
     // clang-format off
-    std::vector<VideoMode> defaultWindowSizes = {
+    std::array defaultWindowSizes = {
       VideoMode(800, 600),
       VideoMode(1024, 768),
       VideoMode(1152, 648),
@@ -456,9 +457,8 @@ std::vector<VideoMode> VideoDriverWrapper::GetDefaultWindowSizes() const
       VideoMode(1920, 1080)
     };
     // clang-format on
-    std::vector<VideoMode> windowSizes = ListVideoModes();
-    windowSizes.insert(windowSizes.end(), defaultWindowSizes.begin(), defaultWindowSizes.end());
-    helpers::makeUnique(windowSizes);
+    std::set<VideoMode> windowSizes = ListVideoModes();
+    windowSizes.insert(defaultWindowSizes.begin(), defaultWindowSizes.end());
     return windowSizes;
 }
 

libs/s25main/drivers/VideoDriverWrapper.h

@@ -12,7 +12,9 @@
 #include "driver/VideoMode.h"
 #include "s25util/Singleton.h"
 #include <memory>
+#include <set>
 #include <string>
+#include <vector>
 
 class IVideoDriver;
 class IRenderer;
@@ -61,8 +63,8 @@ class VideoDriverWrapper : public Singleton<VideoDriverWrapper, SingletonPolicie
     Position GetMousePos() const;
 
     /// Get supported resolutions
-    std::vector<VideoMode> ListVideoModes() const;
-    std::vector<VideoMode> GetDefaultWindowSizes() const;
+    std::set<VideoMode> ListVideoModes() const;
+    std::set<VideoMode> GetDefaultWindowSizes() const;
     bool HasVSync() const;
 
     /// Gibt Pointer auf ein Fenster zurück (device-dependent!), HWND unter Windows

libs/s25main/ingameWindows/iwSettings.cpp

@@ -77,14 +77,16 @@ iwSettings::iwSettings()
       ->AddCheckBox(ID_cbLockWindowSize, curPos, cbSize, TextureColor::Grey, _("Lock window size:"), NormalFont, false)
       ->setChecked(!SETTINGS.video.displayMode.resizeable);
 
-    supportedResolutions_ = VIDEODRIVER.ListVideoModes();
+    const auto supportedResolutions = VIDEODRIVER.ListVideoModes();
+    supportedResolutions_.assign(supportedResolutions.begin(), supportedResolutions.end());
     for(const auto& videoMode : supportedResolutions_)
     {
         cbResolution->AddItem(helpers::format("%ux%u", videoMode.width, videoMode.height));
         if(videoMode == SETTINGS.video.fullscreenSize)
             cbResolution->SetSelection(cbResolution->GetNumItems() - 1);
     }
-    windowSizes_ = VIDEODRIVER.GetDefaultWindowSizes();
+    const auto windowSizes = VIDEODRIVER.GetDefaultWindowSizes();
+    windowSizes_.assign(windowSizes.begin(), windowSizes.end());
     cbWindowSize.AddItem(""); // Placeholder for current window size
     for(const auto& size : windowSizes_)
         cbWindowSize.AddItem(helpers::format("%ux%u", size.width, size.height));