r3235 - in trunk/data: gfx/menu/default gfx/menu/xaw qcsrc/menu-div0test qcsrc/menu-div0test/item qcsrc/menu-div0test/nexuiz

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-01-23 07:07:07 -0500 (Wed, 23 Jan 2008)
New Revision: 3235

Modified:
   trunk/data/gfx/menu/default/skinvalues.txt
   trunk/data/gfx/menu/xaw/skinvalues.txt
   trunk/data/qcsrc/menu-div0test/item/borderimage.c
   trunk/data/qcsrc/menu-div0test/item/dialog.c
   trunk/data/qcsrc/menu-div0test/nexuiz/dialog.c
   trunk/data/qcsrc/menu-div0test/skin-customizables.inc
Log:
make posiiton of zoomed-out title bar skinnable


Modified: trunk/data/gfx/menu/default/skinvalues.txt
===================================================================
--- trunk/data/gfx/menu/default/skinvalues.txt	2008-01-23 11:58:38 UTC (rev 3234)
+++ trunk/data/gfx/menu/default/skinvalues.txt	2008-01-23 12:07:07 UTC (rev 3235)
@@ -3,6 +3,7 @@
 HEIGHT_NORMAL                   1.5
 FONTSIZE_TITLE                  24
 HEIGHT_TITLE                    1.5
+HEIGHT_ZOOMEDTITLE              -1
 
 // the individual dialog background colors
 COLOR_DIALOG_MULTIPLAYER        '0.7 0.7 1'

Modified: trunk/data/gfx/menu/xaw/skinvalues.txt
===================================================================
--- trunk/data/gfx/menu/xaw/skinvalues.txt	2008-01-23 11:58:38 UTC (rev 3234)
+++ trunk/data/gfx/menu/xaw/skinvalues.txt	2008-01-23 12:07:07 UTC (rev 3235)
@@ -3,6 +3,7 @@
 HEIGHT_NORMAL                   1.5
 FONTSIZE_TITLE                  24
 HEIGHT_TITLE                    1.5
+HEIGHT_ZOOMEDTITLE              -1
 
 // the individual dialog background colors
 COLOR_DIALOG_MAPINFO            '1 1 1'

Modified: trunk/data/qcsrc/menu-div0test/item/borderimage.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/item/borderimage.c	2008-01-23 11:58:38 UTC (rev 3234)
+++ trunk/data/qcsrc/menu-div0test/item/borderimage.c	2008-01-23 12:07:07 UTC (rev 3235)
@@ -11,6 +11,7 @@
 	ATTRIB(BorderImage, realFontSize_Nexposeed, vector, '0 0 0')
 	ATTRIB(BorderImage, realOrigin_Nexposeed, vector, '0 0 0')
 	ATTRIB(BorderImage, isNexposeeTitleBar, float, 0)
+	ATTRIB(BorderImage, zoomedOutTitleBarPosition, float, -1)
 ENDCLASS(BorderImage)
 #endif
 
@@ -27,7 +28,7 @@
 		vector scrs;
 		scrs = eX * conwidth + eY * conheight;
 		resizeNotifyLabel(me, relOrigin, relSize, boxToGlobal(me.parent.Nexposee_smallOrigin, '0 0 0', scrs), boxToGlobalSize(me.parent.Nexposee_smallSize, scrs));
-		me.realOrigin_y = -me.realFontSize_y;
+		me.realOrigin_y = me.realFontSize_y * me.zoomedOutTitleBarPosition;
 		me.realOrigin_Nexposeed = me.realOrigin;
 		me.realFontSize_Nexposeed = me.realFontSize;
 	}

Modified: trunk/data/qcsrc/menu-div0test/item/dialog.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/item/dialog.c	2008-01-23 11:58:38 UTC (rev 3234)
+++ trunk/data/qcsrc/menu-div0test/item/dialog.c	2008-01-23 12:07:07 UTC (rev 3235)
@@ -55,6 +55,7 @@
 	ATTRIB(Dialog, rowHeight, float, 0) // pixels
 	ATTRIB(Dialog, titleHeight, float, 0) // pixels
 	ATTRIB(Dialog, titleFontSize, float, 0) // pixels; if 0, title causes no margin
+	ATTRIB(Dialog, zoomedOutTitleBarPosition, float, -1)
 
 	ATTRIB(Dialog, backgroundImage, string, string_null)
 	ATTRIB(Dialog, closeButtonImage, string, string_null)
@@ -127,6 +128,7 @@
 
 	me.frame = spawnBorderImage();
 	me.frame.configureBorderImage(me.frame, me.title, me.titleFontSize, me.color, me.backgroundImage, me.titleHeight);
+	me.frame.zoomedOutTitleBarPosition = me.zoomedOutTitleBarPosition;
 	me.addItem(me, me.frame, '0 0 0', '1 1 0', 1);
 
 	if not(me.titleFontSize)

Modified: trunk/data/qcsrc/menu-div0test/nexuiz/dialog.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/dialog.c	2008-01-23 11:58:38 UTC (rev 3234)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/dialog.c	2008-01-23 12:07:07 UTC (rev 3235)
@@ -21,6 +21,7 @@
 
 	ATTRIB(NexuizDialog, backgroundImage, string, SKINGFX_DIALOGBORDER)
 	ATTRIB(NexuizDialog, closeButtonImage, string, SKINGFX_CLOSEBUTTON)
+	ATTRIB(NexuizDialog, zoomedOutTitleBarPosition, float, SKINHEIGHT_ZOOMEDTITLE * 0.5 - 0.5)
 ENDCLASS(NexuizDialog)
 #endif
 

Modified: trunk/data/qcsrc/menu-div0test/skin-customizables.inc
===================================================================
--- trunk/data/qcsrc/menu-div0test/skin-customizables.inc	2008-01-23 11:58:38 UTC (rev 3234)
+++ trunk/data/qcsrc/menu-div0test/skin-customizables.inc	2008-01-23 12:07:07 UTC (rev 3235)
@@ -35,6 +35,7 @@
 	SKINFLOAT(HEIGHT_NORMAL, 1.5);
 	SKINFLOAT(FONTSIZE_TITLE, 24);
 	SKINFLOAT(HEIGHT_TITLE, 1.5);
+	SKINFLOAT(HEIGHT_ZOOMEDTITLE, -1);
 
 	// the individual dialog background colors
 	SKINVECTOR(COLOR_DIALOG_MULTIPLAYER, '0.7 0.7 1');