From c4ce842d67112263aaf5114755d62e176ce56de7 Mon Sep 17 00:00:00 2001
From: div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Wed, 23 Jan 2008 12:07:07 +0000
Subject: [PATCH] make posiiton of zoomed-out title bar skinnable

git-svn-id: svn://svn.icculus.org/nexuiz/trunk/data@3235 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 gfx/menu/default/skinvalues.txt            | 1 +
 gfx/menu/xaw/skinvalues.txt                | 1 +
 qcsrc/menu-div0test/item/borderimage.c     | 3 ++-
 qcsrc/menu-div0test/item/dialog.c          | 2 ++
 qcsrc/menu-div0test/nexuiz/dialog.c        | 1 +
 qcsrc/menu-div0test/skin-customizables.inc | 1 +
 6 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/gfx/menu/default/skinvalues.txt b/gfx/menu/default/skinvalues.txt
index 2f8e0f2b1..3b9b062ea 100644
--- a/gfx/menu/default/skinvalues.txt
+++ b/gfx/menu/default/skinvalues.txt
@@ -3,6 +3,7 @@ FONTSIZE_NORMAL                 12
 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'
diff --git a/gfx/menu/xaw/skinvalues.txt b/gfx/menu/xaw/skinvalues.txt
index a28b80cee..74c68b3fd 100644
--- a/gfx/menu/xaw/skinvalues.txt
+++ b/gfx/menu/xaw/skinvalues.txt
@@ -3,6 +3,7 @@ FONTSIZE_NORMAL                 12
 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'
diff --git a/qcsrc/menu-div0test/item/borderimage.c b/qcsrc/menu-div0test/item/borderimage.c
index f3de512da..12ed0e507 100644
--- a/qcsrc/menu-div0test/item/borderimage.c
+++ b/qcsrc/menu-div0test/item/borderimage.c
@@ -11,6 +11,7 @@ CLASS(BorderImage) EXTENDS(Label)
 	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 @@ void resizeNotifyBorderImage(entity me, vector relOrigin, vector relSize, vector
 		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;
 	}
diff --git a/qcsrc/menu-div0test/item/dialog.c b/qcsrc/menu-div0test/item/dialog.c
index 4286d5047..84341e26f 100644
--- a/qcsrc/menu-div0test/item/dialog.c
+++ b/qcsrc/menu-div0test/item/dialog.c
@@ -55,6 +55,7 @@ CLASS(Dialog) EXTENDS(InputContainer)
 	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 @@ void configureDialogDialog(entity me)
 
 	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)
diff --git a/qcsrc/menu-div0test/nexuiz/dialog.c b/qcsrc/menu-div0test/nexuiz/dialog.c
index 1349db4f4..1cf9ff883 100644
--- a/qcsrc/menu-div0test/nexuiz/dialog.c
+++ b/qcsrc/menu-div0test/nexuiz/dialog.c
@@ -21,6 +21,7 @@ CLASS(NexuizDialog) EXTENDS(Dialog)
 
 	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
 
diff --git a/qcsrc/menu-div0test/skin-customizables.inc b/qcsrc/menu-div0test/skin-customizables.inc
index 61b5c2fd9..d850fb653 100644
--- a/qcsrc/menu-div0test/skin-customizables.inc
+++ b/qcsrc/menu-div0test/skin-customizables.inc
@@ -35,6 +35,7 @@ SKINBEGIN
 	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');
-- 
2.39.2