Code formatting

client/windows/CMessage.cpp

@@ -11,42 +11,36 @@
 #include "StdInc.h"
 #include "CMessage.h"
 
-#include "../CGameInfo.h"
-#include "../../lib/CGeneralTextHandler.h"
 #include "../../lib/TextOperations.h"
 
-#include "../windows/InfoWindows.h"
-#include "../widgets/Images.h"
-#include "../widgets/Buttons.h"
-#include "../widgets/CComponent.h"
-#include "../widgets/Slider.h"
-#include "../widgets/TextControls.h"
 #include "../gui/CGuiHandler.h"
 #include "../render/CAnimation.h"
-#include "../render/IImage.h"
-#include "../render/IRenderHandler.h"
 #include "../render/Canvas.h"
 #include "../render/Graphics.h"
 #include "../render/IFont.h"
-#include "../renderSDL/SDL_Extensions.h"
+#include "../render/IImage.h"
+#include "../render/IRenderHandler.h"
+#include "../widgets/Buttons.h"
+#include "../widgets/CComponent.h"
+#include "../widgets/Images.h"
+#include "../widgets/Slider.h"
+#include "../widgets/TextControls.h"
+#include "../windows/InfoWindows.h"
 
 const int BEFORE_COMPONENTS = 30;
 const int SIDE_MARGIN = 30;
 
-namespace
-{
-	std::array<std::shared_ptr<CAnimation>, PlayerColor::PLAYER_LIMIT_I> dialogBorders;
-	std::array<std::vector<std::shared_ptr<IImage>>, PlayerColor::PLAYER_LIMIT_I> piecesOfBox;
-}
+static std::array<std::shared_ptr<CAnimation>, PlayerColor::PLAYER_LIMIT_I> dialogBorders;
+static std::array<std::vector<std::shared_ptr<IImage>>, PlayerColor::PLAYER_LIMIT_I> piecesOfBox;
 
 void CMessage::init()
 {
-	for(int i=0; i<PlayerColor::PLAYER_LIMIT_I; i++)
+	for(int i = 0; i < PlayerColor::PLAYER_LIMIT_I; i++)
 	{
 		dialogBorders[i] = GH.renderHandler().loadAnimation(AnimationPath::builtin("DIALGBOX"));
 		dialogBorders[i]->preload();
 
-		for(int j=0; j < dialogBorders[i]->size(0); j++)
+		for(int j = 0; j < dialogBorders[i]->size(0); j++)
 		{
 			auto image = dialogBorders[i]->getImage(j, 0);
 			//assume blue color initially
@@ -63,42 +57,42 @@ void CMessage::dispose()
 		item.reset();
 }
 
-std::vector<std::string> CMessage::breakText( std::string text, size_t maxLineWidth, EFonts font )
+std::vector<std::string> CMessage::breakText(std::string text, size_t maxLineWidth, EFonts font)
 {
 	assert(maxLineWidth != 0);
-	if (maxLineWidth == 0)
-		return { text };
+	if(maxLineWidth == 0)
+		return {text};
 
 	std::vector<std::string> ret;
 
-	boost::algorithm::trim_right_if(text,boost::algorithm::is_any_of(std::string(" ")));
+	boost::algorithm::trim_right_if(text, boost::algorithm::is_any_of(std::string(" ")));
 
 	// each iteration generates one output line
-	while (text.length())
+	while(text.length())
 	{
-		ui32 lineWidth = 0;    //in characters or given char metric
-		ui32 wordBreak = -1;    //last position for line break (last space character)
-		ui32 currPos = 0;       //current position in text
-		bool opened = false;    //set to true when opening brace is found
-		std::string color = "";    //color found
+		ui32 lineWidth = 0; //in characters or given char metric
+		ui32 wordBreak = -1; //last position for line break (last space character)
+		ui32 currPos = 0; //current position in text
+		bool opened = false; //set to true when opening brace is found
+		std::string color = ""; //color found
 
 		size_t symbolSize = 0; // width of character, in bytes
 		size_t glyphWidth = 0; // width of printable glyph, pixels
 
 		// loops till line is full or end of text reached
-		while(currPos < text.length()  &&  text[currPos] != 0x0a  &&  lineWidth < maxLineWidth)
+		while(currPos < text.length() && text[currPos] != 0x0a && lineWidth < maxLineWidth)
 		{
 			symbolSize = TextOperations::getUnicodeCharacterSize(text[currPos]);
 			glyphWidth = graphics->fonts[font]->getGlyphWidth(text.data() + currPos);
 
 			// candidate for line break
-			if (ui8(text[currPos]) <= ui8(' '))
+			if(ui8(text[currPos]) <= ui8(' '))
 				wordBreak = currPos;
 
 			/* We don't count braces in string length. */
-			if (text[currPos] == '{')
+			if(text[currPos] == '{')
 			{
-				opened=true;
+				opened = true;
 
 				std::smatch match;
 				std::regex expr("^\\{(.*?)\\|");
@@ -113,9 +107,9 @@ std::vector<std::string> CMessage::breakText( std::string text, size_t maxLineWi
 					}
 				}
 			}
-			else if (text[currPos]=='}')
+			else if(text[currPos] == '}')
 			{
-				opened=false;
+				opened = false;
 				color = "";
 			}
 			else
@@ -124,9 +118,9 @@ std::vector<std::string> CMessage::breakText( std::string text, size_t maxLineWi
 		}
 
 		// long line, create line break
-		if (currPos < text.length()  &&  (text[currPos] != 0x0a))
+		if(currPos < text.length() && (text[currPos] != 0x0a))
 		{
-			if (wordBreak != ui32(-1))
+			if(wordBreak != ui32(-1))
 				currPos = wordBreak;
 			else
 				currPos -= (ui32)symbolSize;
@@ -137,7 +131,7 @@ std::vector<std::string> CMessage::breakText( std::string text, size_t maxLineWi
 		{
 			ret.push_back(text.substr(0, currPos));
 
-			if (opened)
+			if(opened)
 				/* Close the brace for the current line. */
 				ret.back() += '}';
 
@@ -148,7 +142,7 @@ std::vector<std::string> CMessage::breakText( std::string text, size_t maxLineWi
 			ret.push_back(""); //add empty string, no extra actions needed
 		}
 
-		if (text.length() != 0 && text[0] == 0x0a)
+		if(text.length() != 0 && text[0] == 0x0a)
 		{
 			/* Remove LF */
 			text.erase(0, 1);
@@ -157,19 +151,19 @@ std::vector<std::string> CMessage::breakText( std::string text, size_t maxLineWi
 		{
 			// trim only if line does not starts with LF
 			// FIXME: necessary? All lines will be trimmed before returning anyway
-			boost::algorithm::trim_left_if(text,boost::algorithm::is_any_of(std::string(" ")));
+			boost::algorithm::trim_left_if(text, boost::algorithm::is_any_of(std::string(" ")));
 		}
 
-		if (opened)
+		if(opened)
 		{
 			/* Add an opening brace for the next line. */
-			if (text.length() != 0)
+			if(text.length() != 0)
 				text.insert(0, "{" + color);
 		}
 	}
 
 	/* Trim whitespaces of every line. */
-	for (auto & elem : ret)
+	for(auto & elem : ret)
 		boost::algorithm::trim(elem);
 
 	return ret;
@@ -196,11 +190,11 @@ int CMessage::guessHeight(const std::string & txt, int width, EFonts font)
 
 int CMessage::getEstimatedComponentHeight(int numComps)
 {
-	if (numComps > 8) //Bigger than 8 components - return invalid value
+	if(numComps > 8) //Bigger than 8 components - return invalid value
 		return std::numeric_limits<int>::max();
-	else if (numComps > 2)
+	else if(numComps > 2)
 		return 160; // 32px * 1 row + 20 to offset
-	else if (numComps)
+	else if(numComps)
 		return 118; // 118 px to offset
 	return 0;
 }
@@ -208,17 +202,17 @@ int CMessage::getEstimatedComponentHeight(int numComps)
 void CMessage::drawIWindow(CInfoWindow * ret, std::string text, PlayerColor player)
 {
 	constexpr std::array textAreaSizes = {
-		Point(300, 200),  // if message is small, h3 will use 300px-wide text box with up to 200px height
-		Point(400, 200),  // once text no longer fits into 300x200 box, h3 will start using 400px - wide boxes
-		Point(600, 200)   // if 400px is not enough either, h3 will use largest, 600px-wide textbox, potentially with slider
+		Point(300, 200), // if message is small, h3 will use 300px-wide text box with up to 200px height
+		Point(400, 200), // once text no longer fits into 300x200 box, h3 will start using 400px - wide boxes
+		Point(600, 200) // if 400px is not enough either, h3 will use largest, 600px-wide textbox, potentially with slider
 	};
 
 	assert(ret && ret->text);
 
-	for (auto const & area : textAreaSizes)
+	for(const auto & area : textAreaSizes)
 	{
 		ret->text->resize(area);
-		if (!ret->text->slider)
+		if(!ret->text->slider)
 			break; // suitable size found, use it
 	}
 
@@ -229,27 +223,27 @@ void CMessage::drawIWindow(CInfoWindow * ret, std::string text, PlayerColor play
 
 	Point winSize(ret->text->pos.w, ret->text->pos.h); //start with text size
 
-	if (ret->components)
+	if(ret->components)
 		winSize.y += 10 + ret->components->pos.h; //space to first component
 
 	int bw = 0;
-	if (ret->buttons.size())
+	if(ret->buttons.size())
 	{
 		int bh = 0;
 		// Compute total width of buttons
-		bw = 20*((int)ret->buttons.size()-1); // space between all buttons
+		bw = 20 * ((int)ret->buttons.size() - 1); // space between all buttons
 		for(auto & elem : ret->buttons) //and add buttons width
 		{
-			bw+=elem->pos.w;
+			bw += elem->pos.w;
 			vstd::amax(bh, elem->pos.h);
 		}
-		winSize.y += 20 + bh;//before button + button
+		winSize.y += 20 + bh; //before button + button
 	}
 
 	// Clip window size
 	vstd::amax(winSize.y, 50);
 	vstd::amax(winSize.x, 80);
-	if (ret->components)
+	if(ret->components)
 		vstd::amax(winSize.x, ret->components->pos.w);
 	vstd::amax(winSize.x, bw);
 
@@ -261,19 +255,19 @@ void CMessage::drawIWindow(CInfoWindow * ret, std::string text, PlayerColor play
 	ret->backgroundTexture->pos = ret->pos;
 
 	int curh = SIDE_MARGIN;
-	int xOffset = (ret->pos.w - ret->text->pos.w)/2;
+	int xOffset = (ret->pos.w - ret->text->pos.w) / 2;
 
 	if(ret->buttons.empty() && !ret->components) //improvement for very small text only popups -> center text vertically
 	{
-		if(ret->pos.h > ret->text->pos.h + 2*SIDE_MARGIN)
-			curh = (ret->pos.h - ret->text->pos.h)/2;
+		if(ret->pos.h > ret->text->pos.h + 2 * SIDE_MARGIN)
+			curh = (ret->pos.h - ret->text->pos.h) / 2;
 	}
 
 	ret->text->moveBy(Point(xOffset, curh));
 
 	curh += ret->text->pos.h;
 
-	if (ret->components)
+	if(ret->components)
 	{
 		curh += BEFORE_COMPONENTS;
 		curh += ret->components->pos.h;
@@ -282,7 +276,7 @@ void CMessage::drawIWindow(CInfoWindow * ret, std::string text, PlayerColor play
 	if(ret->buttons.size())
 	{
 		// Position the buttons at the bottom of the window
-		bw = (ret->pos.w/2) - (bw/2);
+		bw = (ret->pos.w / 2) - (bw / 2);
 		curh = ret->pos.h - SIDE_MARGIN - ret->buttons[0]->pos.h;
 
 		for(auto & elem : ret->buttons)
@@ -291,7 +285,7 @@ void CMessage::drawIWindow(CInfoWindow * ret, std::string text, PlayerColor play
 			bw += elem->pos.w + 20;
 		}
 	}
-	if (ret->components)
+	if(ret->components)
 		ret->components->moveBy(Point(ret->pos.x, ret->pos.y));
 }
 
@@ -306,8 +300,9 @@ void CMessage::drawBorder(PlayerColor playerColor, Canvas & to, int w, int h, in
 	// Horizontal borders
 	int start_x = x + box[0]->width();
 	const int stop_x = x + w - box[1]->width();
-	const int bottom_y = y+h-box[7]->height()+1;
-	while (start_x < stop_x) {
+	const int bottom_y = y + h - box[7]->height() + 1;
+	while(start_x < stop_x)
+	{
 
 		// Top border
 		to.draw(box[6], Point(start_x, y));
@@ -319,9 +314,10 @@ void CMessage::drawBorder(PlayerColor playerColor, Canvas & to, int w, int h, in
 
 	// Vertical borders
 	int start_y = y + box[0]->height();
-	const int stop_y = y + h - box[2]->height()+1;
-	const int right_x = x+w-box[5]->width();
-	while (start_y < stop_y) {
+	const int stop_y = y + h - box[2]->height() + 1;
+	const int right_x = x + w - box[5]->width();
+	while(start_y < stop_y)
+	{
 
 		// Left border
 		to.draw(box[4], Point(x, start_y));
@@ -332,8 +328,8 @@ void CMessage::drawBorder(PlayerColor playerColor, Canvas & to, int w, int h, in
 	}
 
 	//corners
-	to.draw(box[0], Point(x,y));
-	to.draw(box[1], Point(x+w-box[1]->width(), y));
-	to.draw(box[2], Point(x, y+h-box[2]->height()+1));
-	to.draw(box[3], Point(x+w-box[3]->width(), y+h-box[3]->height()+1));
+	to.draw(box[0], Point(x, y));
+	to.draw(box[1], Point(x + w - box[1]->width(), y));
+	to.draw(box[2], Point(x, y + h - box[2]->height() + 1));
+	to.draw(box[3], Point(x + w - box[3]->width(), y + h - box[3]->height() + 1));
 }