From: terencehill <piuntn@gmail.com>
Date: Mon, 13 Jul 2015 19:15:48 +0000 (+0200)
Subject: Improve map voting and gametype voting layouts: items as big as possible with minimum... 
X-Git-Tag: xonotic-v0.8.1~22^2~13
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a3166be49e224579343dfe96871a536f9401f03f;p=xonotic%2Fxonotic-data.pk3dir.git

Improve map voting and gametype voting layouts: items as big as possible with minimum alteration of the desired item aspect ratio (like the weapons panel layout)

Signed-off-by: terencehill <piuntn@gmail.com>
---

diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc
index f00ee544c..d4e0f6280 100644
--- a/qcsrc/client/mapvoting.qc
+++ b/qcsrc/client/mapvoting.qc
@@ -294,6 +294,7 @@ float MapVote_Selection(vector topleft, vector cellsize, float rows, float colum
 	return mv_mouse_selection;
 }
 
+vector HUD_GetTableSize(int item_count, vector psize, float item_aspect);
 void MapVote_Draw()
 {
 	string map;
@@ -362,7 +363,10 @@ void MapVote_Draw()
 	if(mv_abstain)
 		mv_num_maps -= 1;
 
-	rows = ceil(mv_num_maps / mv_columns);
+	int item_aspect = (gametypevote) ? 2/1 : 4/3;
+	vector table_size = HUD_GetTableSize(mv_num_maps, eX * (xmax - xmin) + eY * (ymax - ymin), item_aspect);
+	mv_columns = table_size.x;
+	rows = table_size.y;
 
 	dist.x = (xmax - xmin) / mv_columns;
 	dist.y = (ymax - pos.y) / rows;
@@ -598,8 +602,6 @@ void MapVote_Init()
 
 	gametypevote = ReadByte();
 
-	float mv_real_num_maps = mv_num_maps - mv_abstain;
-
 	if(gametypevote)
 	{
 		mapvote_chosenmap = strzone(ReadString());
@@ -608,22 +610,6 @@ void MapVote_Init()
 
 		gtv_text_size = hud_fontsize*1.4;
 		gtv_text_size_small = hud_fontsize*1.1;
-
-		if (mv_real_num_maps > 8 )
-			mv_columns = 3;
-		else
-			mv_columns = min(2, mv_real_num_maps);
-    }
-    else
-	{
-		if (mv_real_num_maps > 16)
-			mv_columns = 5;
-		else if (mv_real_num_maps > 9)
-			mv_columns = 4;
-		else if(mv_real_num_maps > 3)
-			mv_columns = 3;
-		else
-			mv_columns = mv_real_num_maps;
 	}
 
 	MapVote_ReadMask();