From: Severin Meyer <sev.ch@web.de>
Date: Fri, 12 Sep 2014 02:37:14 +0000 (+0200)
Subject: Make the tooltip text color editable in menu skins
X-Git-Tag: xonotic-v0.8.0~181^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a0d3733635f75275d5dcd623b61762e973a0183f;p=xonotic%2Fxonotic-data.pk3dir.git

Make the tooltip text color editable in menu skins
---

diff --git a/qcsrc/menu/menu.qc b/qcsrc/menu/menu.qc
index 382a19d2d..d7fd581a3 100644
--- a/qcsrc/menu/menu.qc
+++ b/qcsrc/menu/menu.qc
@@ -666,7 +666,7 @@ void m_tooltip(vector pos)
 			while(getWrappedLine_remaining)
 			{
 				s = getWrappedLine(SKINWIDTH_TOOLTIP, fontsize, draw_TextWidth_WithoutColors);
-				draw_Text(p, s, fontsize, '1 1 1', SKINALPHA_TOOLTIP * menuTooltipAlpha, FALSE);
+				draw_Text(p, s, fontsize, SKINCOLOR_TOOLTIP, SKINALPHA_TOOLTIP * menuTooltipAlpha, FALSE);
 				p_y += fontsize_y;
 			}
 		}
diff --git a/qcsrc/menu/skin-customizables.inc b/qcsrc/menu/skin-customizables.inc
index 6b084f54a..1b8f3e38b 100644
--- a/qcsrc/menu/skin-customizables.inc
+++ b/qcsrc/menu/skin-customizables.inc
@@ -45,10 +45,11 @@ SKINBEGIN
 	SKINSTRING(GFX_TOOLTIP, "tooltip");
 	SKINVECTOR(MARGIN_TOOLTIP, '5 5 0');
 	SKINVECTOR(BORDER_TOOLTIP, '1 1 0');
+	SKINVECTOR(AVOID_TOOLTIP, '8 8 0');
+	SKINFLOAT(WIDTH_TOOLTIP, 0.3);
 	SKINFLOAT(FONTSIZE_TOOLTIP, 12);
 	SKINFLOAT(ALPHA_TOOLTIP, 0.7);
-	SKINFLOAT(WIDTH_TOOLTIP, 0.3);
-	SKINVECTOR(AVOID_TOOLTIP, '8 8 0');
+	SKINVECTOR(COLOR_TOOLTIP, '1 1 1');
 
 	// the individual dialog background colors
 	SKINVECTOR(COLOR_DIALOG_FIRSTRUN, '0.7 0.7 1');