Added an sdl::window wrapper for SDL_GetWindowDisplayIndex

wesnoth · Dec 6, 2016 · b33fc6a · b33fc6a
1 parent cbcb355
commit b33fc6a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/src/sdl/window.cpp b/src/sdl/window.cpp
@@ -129,6 +129,11 @@ void window::set_minimum_size(int min_w, int min_h)
 	SDL_SetWindowMinimumSize(window_, min_w, min_h);
 }
 
+int window::get_display_index()
+{
+	return SDL_GetWindowDisplayIndex(window_);
+}
+
 window::operator SDL_Window*()
 {
 	return window_;

diff --git a/src/sdl/window.hpp b/src/sdl/window.hpp
@@ -151,6 +151,8 @@ class window
 	 */
 	void set_minimum_size(int min_w, int min_h);
 
+	int get_display_index();
+
 	/***** ***** ***** Conversion operators. ***** ***** *****/
 
 	/**

diff --git a/src/video.cpp b/src/video.cpp
@@ -368,20 +368,15 @@ sdl::window *CVideo::get_window()
 	return window.get();
 }
 
-
-static int sdl_display_index(sdl::window* window)
-{
-	if(window) {
-		return SDL_GetWindowDisplayIndex(*window);
-	}
-	return 0;
-}
-
 std::vector<std::pair<int, int> > CVideo::get_available_resolutions(const bool include_current)
 {
 	std::vector<std::pair<int, int> > result;
 
-	const int modes = SDL_GetNumDisplayModes(sdl_display_index(window.get()));
+	if(!window) {
+		return result;
+	}
+
+	const int modes = SDL_GetNumDisplayModes(window->get_display_index());
 	if (modes <= 0) {
 		std::cerr << "No modes supported\n";
 		return result;