X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgraphics%2Fx11%2Fdisplay.cpp;h=972cc8236f25024eec7fee0167811a4aeb76814b;hb=HEAD;hp=60c2182b9f5f09093f4fb89317b9174d1a5cbb1e;hpb=27356249e3607c78f5da9823c88703a6f4f7bed1;p=libs%2Fgui.git

diff --git a/source/graphics/x11/display.cpp b/source/graphics/x11/display.cpp
index 60c2182..b5888c6 100644
--- a/source/graphics/x11/display.cpp
+++ b/source/graphics/x11/display.cpp
@@ -61,25 +61,8 @@ inline Rotation rotation_to_sys(Msp::Graphics::VideoRotation r)
 	default: return RR_Rotate_0;
 	}
 }
-
-inline bool monitor_x_compare(const Msp::Graphics::Monitor &m1, const Msp::Graphics::Monitor &m2)
-{
-	if(m1.desktop_settings.mode && !m2.desktop_settings.mode)
-		return true;
-	if(!m1.desktop_settings.mode && m2.desktop_settings.mode)
-		return false;
-	return m1.desktop_settings.x<m2.desktop_settings.x;
-}
 #endif
 
-inline unsigned mode_width(const Msp::Graphics::VideoMode &m, Msp::Graphics::VideoRotation r)
-{
-	if(r==Msp::Graphics::ROTATE_RIGHT || r==Msp::Graphics::ROTATE_LEFT)
-		return m.height;
-	else
-		return m.width;
-}
-
 }
 
 
@@ -211,7 +194,13 @@ Display::Display(const string &disp_name):
 				monitors[i].current_settings = monitors[i].desktop_settings;
 			}
 
-			sort(monitors, monitor_x_compare);
+			sort(monitors, [](const Msp::Graphics::Monitor &m1, const Msp::Graphics::Monitor &m2){
+				if(m1.desktop_settings.mode && !m2.desktop_settings.mode)
+					return true;
+				if(!m1.desktop_settings.mode && m2.desktop_settings.mode)
+					return false;
+				return m1.desktop_settings.x<m2.desktop_settings.x;
+			});
 
 			for(unsigned i=0; i<modes.size(); ++i)
 			{