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

[DONOTREPLY at icculus.org]

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

Modified:
   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
Log:
put the skin under control whether the title bar shall be zoomed out or not


Modified: trunk/data/gfx/menu/xaw/skinvalues.txt
===================================================================
--- trunk/data/gfx/menu/xaw/skinvalues.txt	2008-01-23 12:17:14 UTC (rev 3237)
+++ trunk/data/gfx/menu/xaw/skinvalues.txt	2008-01-23 12:51:06 UTC (rev 3238)
@@ -3,7 +3,7 @@
 HEIGHT_NORMAL                   1.5
 FONTSIZE_TITLE                  16
 HEIGHT_TITLE                    1.5
-HEIGHT_ZOOMEDTITLE              -1
+HEIGHT_ZOOMEDTITLE              0
 
 // 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 12:17:14 UTC (rev 3237)
+++ trunk/data/qcsrc/menu-div0test/item/borderimage.c	2008-01-23 12:51:06 UTC (rev 3238)
@@ -11,7 +11,8 @@
 	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)
+	ATTRIB(BorderImage, zoomedOutTitleBarPosition, float, 0)
+	ATTRIB(BorderImage, zoomedOutTitleBar, float, 0)
 ENDCLASS(BorderImage)
 #endif
 
@@ -19,10 +20,11 @@
 void resizeNotifyBorderImage(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
 {
 	me.isNexposeeTitleBar = 0;
-	if(me.parent.parent.instanceOfNexposee)
-		if(me.parent.instanceOfDialog)
-			if(me == me.parent.frame)
-				me.isNexposeeTitleBar = 1;
+	if(me.zoomedOutTitleBar)
+		if(me.parent.parent.instanceOfNexposee)
+			if(me.parent.instanceOfDialog)
+				if(me == me.parent.frame)
+					me.isNexposeeTitleBar = 1;
 	if(me.isNexposeeTitleBar)
 	{
 		vector scrs;

Modified: trunk/data/qcsrc/menu-div0test/item/dialog.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/item/dialog.c	2008-01-23 12:17:14 UTC (rev 3237)
+++ trunk/data/qcsrc/menu-div0test/item/dialog.c	2008-01-23 12:51:06 UTC (rev 3238)
@@ -55,7 +55,8 @@
 	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, zoomedOutTitleBarPosition, float, 0)
+	ATTRIB(Dialog, zoomedOutTitleBar, float, 0)
 
 	ATTRIB(Dialog, backgroundImage, string, string_null)
 	ATTRIB(Dialog, closeButtonImage, string, string_null)
@@ -129,6 +130,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.frame.zoomedOutTitleBar = me.zoomedOutTitleBar;
 	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 12:17:14 UTC (rev 3237)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/dialog.c	2008-01-23 12:51:06 UTC (rev 3238)
@@ -22,6 +22,7 @@
 	ATTRIB(NexuizDialog, backgroundImage, string, SKINGFX_DIALOGBORDER)
 	ATTRIB(NexuizDialog, closeButtonImage, string, SKINGFX_CLOSEBUTTON)
 	ATTRIB(NexuizDialog, zoomedOutTitleBarPosition, float, SKINHEIGHT_ZOOMEDTITLE * 0.5 - 0.5)
+	ATTRIB(NexuizDialog, zoomedOutTitleBar, float, SKINHEIGHT_ZOOMEDTITLE != 0)
 ENDCLASS(NexuizDialog)
 #endif