Added a preserve_attribute option to the ui::Paint::print_bitmap() functions and the ui::Bitmap class,

preserve aspect ratio on the loader screen image and the main menu background.

2 files changed, 7 insertions, 4 deletions

diff --git a/src/client/mainmenu.cc b/src/client/mainmenu.cc
index 7374224..a70cad0 100644
--- a/src/client/mainmenu.cc
+++ b/src/client/mainmenu.cc
@@ -352,7 +352,7 @@ void MainMenu::draw_background()
 	// we override draw_background instead of adding a ui::Bitmap child
 	// this simplifies child window managment
 	if (mainmenu_background.size()) {
-		ui::Paint::draw_bitmap(global_location(), size(), math::Color(), mainmenu_background);
+		ui::Paint::draw_bitmap(global_location(), size(), mainmenu_background, true);
 	}
 }
 
diff --git a/src/client/video.cc b/src/client/video.cc
index a75089f..0f0c984 100644
--- a/src/client/video.cc
+++ b/src/client/video.cc
@@ -312,9 +312,12 @@ void draw_loader()
 	gl::enable(GL_BLEND);
 
 	gl::color(1.0f, 1.0f, 1.0f, 1.0f);
-	math::Vector2f pos;
-	math::Vector2f size(render::State::width(), render::State::height());
-	ui::Paint::draw_bitmap(pos, size, "bitmaps/loader");
+
+	
+	const std::string loader_texture("bitmaps/loader");
+	const math::Vector2f size(render::State::width(), render::State::height());
+	const math::Vector2f pos;
+	ui::Paint::draw_bitmap(pos, size, loader_texture, true);
 
 	if (loader_message.size()) {
 		using render::Text;