X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgraphics%2Fdisplay.cpp;h=40112a35f9408760c5f6ab05ea286033403282b1;hb=2438c3cdd14087bfc3375ed1f5521ad5c0c09bbc;hp=22dd705df90c772e6901ae30f618f87db787077a;hpb=89ec4c335953556ca069960adf6ea3a5dc3bb499;p=libs%2Fgui.git

diff --git a/source/graphics/display.cpp b/source/graphics/display.cpp
index 22dd705..40112a3 100644
--- 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,38 @@ void Display::restore_mode()
 			set_mode(*i->desktop_mode, false);
 }
 
-const VideoMode *Display::find_matching_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
+{
+	return find_mode(VideoMode(width, height));
 }
 
 void Display::tick()