Use float rather than unsigned for refresh rate

[libs/gui.git] / source / graphics / display.cpp

diff --git a/source/graphics/display.cpp b/source/graphics/display.cpp
index de5a06952a58e8efa8f3e956ee0f949126775426..40112a35f9408760c5f6ab05ea286033403282b1 100644 (file)
--- a/source/graphics/display.cpp
+++ b/source/graphics/display.cpp
@@ -1,3 +1,4 @@
+#include <cmath>
 #include "display.h"
 #include "display_private.h"
 #include "window.h"
@@ -31,19 +32,33 @@ void Display::restore_mode()
                        set_mode(*i->desktop_mode, false);
 }
 
-const VideoMode *Display::find_mode(const VideoMode &mode) const
+const VideoMode *Display::find_mode(const VideoMode &mode, float rate_tolerance) const
 {
+       const VideoMode *closest = 0;
+       float rate_diff = mode.rate;
        for(list<VideoMode>::const_iterator i=modes.begin(); i!=modes.end(); ++i)
        {
                if(mode.monitor && i->monitor!=mode.monitor)
                        continue;
-               if(mode.rate && i->rate!=mode.rate)
+               if(mode.rate && (i->rate<mode.rate-rate_tolerance || i->rate>mode.rate+rate_tolerance))
                        continue;
-               if(i->width==mode.width && i->height==mode.height)
+               if(i->width!=mode.width || i->height!=mode.height)
+                       continue;
+
+               if(mode.rate)
+               {
+                       float d = abs(i->rate-mode.rate);
+                       if(d<rate_diff)
+                       {
+                               closest = &*i;
+                               rate_diff = d;
+                       }
+               }
+               else
                        return &*i;
        }
 
-       return 0;
+       return closest;
 }
 
 const VideoMode *Display::find_mode(unsigned width, unsigned height) const