From: terencehill <piuntn@gmail.com>
Date: Thu, 4 Jun 2015 17:11:46 +0000 (+0200)
Subject: Better alignment of quickmenu entries with checkboxes
X-Git-Tag: xonotic-v0.8.2~1987^2~15
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f825aa27eacd6f7d376b2651d113f466cdd410cc;p=xonotic%2Fxonotic-data.pk3dir.git

Better alignment of quickmenu entries with checkboxes
---

diff --git a/qcsrc/client/quickmenu.qc b/qcsrc/client/quickmenu.qc
index 5c4e4dad0..d769902b0 100644
--- a/qcsrc/client/quickmenu.qc
+++ b/qcsrc/client/quickmenu.qc
@@ -541,7 +541,18 @@ void HUD_Quickmenu_DrawEntry(vector pos, string desc, string option, vector font
 	entry = textShortenToWidth(desc, desc_width, fontsize, stringwidth_colors);
 	if (autocvar_hud_panel_quickmenu_align > 0)
 	{
-		offset = (desc_width - stringwidth_colors(entry, fontsize)) * min(autocvar_hud_panel_quickmenu_align, 1);
+		float real_desc_width = stringwidth_colors(entry, fontsize);
+		offset = (desc_width - real_desc_width) * min(autocvar_hud_panel_quickmenu_align, 1);
+
+		if(option)
+		{
+			// when there's enough room align description regardless the checkbox
+			float extra_offset = (panel_size.x - desc_width) * min(autocvar_hud_panel_quickmenu_align, 1);
+			if(offset + real_desc_width + extra_offset < desc_width)
+				offset += extra_offset;
+			else
+				offset = max(0, desc_width - real_desc_width);
+		}
 		drawcolorcodedstring(pos + eX * offset, entry, fontsize, panel_fg_alpha, DRAWFLAG_ADDITIVE);
 	}
 	else