r4048 - in trunk/data/qcsrc/menu: . item nexuiz

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-08-07 15:01:55 -0400 (Thu, 07 Aug 2008)
New Revision: 4048

Modified:
   trunk/data/qcsrc/menu/item/label.c
   trunk/data/qcsrc/menu/nexuiz/inputbox.c
   trunk/data/qcsrc/menu/skin-customizables.inc
Log:
changed margin spec of input boxes to use chars, not relative size (fixed weird short inputboxes)


Modified: trunk/data/qcsrc/menu/item/label.c
===================================================================
--- trunk/data/qcsrc/menu/item/label.c	2008-08-07 08:20:42 UTC (rev 4047)
+++ trunk/data/qcsrc/menu/item/label.c	2008-08-07 19:01:55 UTC (rev 4048)
@@ -11,6 +11,8 @@
 	ATTRIB(Label, allowCut, float, 0)
 	ATTRIB(Label, keepspaceLeft, float, 0) // for use by subclasses (radiobuttons for example)
 	ATTRIB(Label, keepspaceRight, float, 0)
+	ATTRIB(Label, marginLeft, float, 0) // alternate way to specify keepspace* (in characters from the font)
+	ATTRIB(Label, marginRight, float, 0)
 	ATTRIB(Label, realFontSize, vector, '0 0 0')
 	ATTRIB(Label, realOrigin, vector, '0 0 0')
 	ATTRIB(Label, alpha, float, 0.7)
@@ -36,6 +38,10 @@
 	// absSize_y is height of label
 	me.realFontSize_y = me.fontSize / absSize_y;
 	me.realFontSize_x = me.fontSize / absSize_x;
+	if(me.marginLeft)
+		me.keepspaceLeft = me.marginLeft * me.realFontSize_x;
+	if(me.marginRight)
+		me.keepspaceRight = me.marginRight * me.realFontSize_x;
 	me.realOrigin_x = me.align * (1 - me.keepspaceLeft - me.keepspaceRight - min(me.realFontSize_x * draw_TextWidth(me.text, 0), (1 - me.keepspaceLeft - me.keepspaceRight))) + me.keepspaceLeft;
 	me.realOrigin_y = 0.5 * (1 - me.realFontSize_y);
 }

Modified: trunk/data/qcsrc/menu/nexuiz/inputbox.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/inputbox.c	2008-08-07 08:20:42 UTC (rev 4047)
+++ trunk/data/qcsrc/menu/nexuiz/inputbox.c	2008-08-07 19:01:55 UTC (rev 4048)
@@ -7,8 +7,8 @@
 	ATTRIB(NexuizInputBox, image, string, SKINGFX_INPUTBOX)
 	ATTRIB(NexuizInputBox, onChange, void(entity, entity), SUB_Null)
 	ATTRIB(NexuizInputBox, onChangeEntity, entity, NULL)
-	ATTRIB(NexuizInputBox, keepspaceLeft, float, SKINMARGIN_INPUTBOX)
-	ATTRIB(NexuizInputBox, keepspaceRight, float, SKINMARGIN_INPUTBOX)
+	ATTRIB(NexuizInputBox, marginLeft, float, SKINMARGIN_INPUTBOX_CHARS)
+	ATTRIB(NexuizInputBox, marginRight, float, SKINMARGIN_INPUTBOX_CHARS)
 	ATTRIB(NexuizInputBox, color, vector, SKINCOLOR_INPUTBOX_N)
 	ATTRIB(NexuizInputBox, colorF, vector, SKINCOLOR_INPUTBOX_F)
 

Modified: trunk/data/qcsrc/menu/skin-customizables.inc
===================================================================
--- trunk/data/qcsrc/menu/skin-customizables.inc	2008-08-07 08:20:42 UTC (rev 4047)
+++ trunk/data/qcsrc/menu/skin-customizables.inc	2008-08-07 19:01:55 UTC (rev 4048)
@@ -121,7 +121,7 @@
 	SKINSTRING(GFX_INPUTBOX, "inputbox");
 	SKINVECTOR(COLOR_INPUTBOX_N, '1 1 1');
 	SKINVECTOR(COLOR_INPUTBOX_F, '1 1 1');
-	SKINFLOAT(MARGIN_INPUTBOX, 0.02);
+	SKINFLOAT(MARGIN_INPUTBOX_CHARS, 1);
 
 	// item: key grabber
 	SKINVECTOR(COLOR_KEYGRABBER_TITLES, '1 1 1');