From 5ecd5960517472b01be8865560d7d6fbb9043317 Mon Sep 17 00:00:00 2001 From: div0 Date: Wed, 23 Jan 2008 12:51:06 +0000 Subject: [PATCH] put the skin under control whether the title bar shall be zoomed out or not git-svn-id: svn://svn.icculus.org/nexuiz/trunk@3238 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/gfx/menu/xaw/skinvalues.txt | 2 +- data/qcsrc/menu-div0test/item/borderimage.c | 12 +++++++----- data/qcsrc/menu-div0test/item/dialog.c | 4 +++- data/qcsrc/menu-div0test/nexuiz/dialog.c | 1 + 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/data/gfx/menu/xaw/skinvalues.txt b/data/gfx/menu/xaw/skinvalues.txt index 327c31fbc..423ac1e67 100644 --- a/data/gfx/menu/xaw/skinvalues.txt +++ b/data/gfx/menu/xaw/skinvalues.txt @@ -3,7 +3,7 @@ FONTSIZE_NORMAL 12 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' diff --git a/data/qcsrc/menu-div0test/item/borderimage.c b/data/qcsrc/menu-div0test/item/borderimage.c index 12ed0e507..294c076b6 100644 --- a/data/qcsrc/menu-div0test/item/borderimage.c +++ b/data/qcsrc/menu-div0test/item/borderimage.c @@ -11,7 +11,8 @@ 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) + ATTRIB(BorderImage, zoomedOutTitleBarPosition, float, 0) + ATTRIB(BorderImage, zoomedOutTitleBar, float, 0) ENDCLASS(BorderImage) #endif @@ -19,10 +20,11 @@ ENDCLASS(BorderImage) 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; diff --git a/data/qcsrc/menu-div0test/item/dialog.c b/data/qcsrc/menu-div0test/item/dialog.c index 84341e26f..9313d184f 100644 --- a/data/qcsrc/menu-div0test/item/dialog.c +++ b/data/qcsrc/menu-div0test/item/dialog.c @@ -55,7 +55,8 @@ 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, zoomedOutTitleBarPosition, float, 0) + ATTRIB(Dialog, zoomedOutTitleBar, float, 0) ATTRIB(Dialog, backgroundImage, string, string_null) ATTRIB(Dialog, closeButtonImage, string, string_null) @@ -129,6 +130,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.frame.zoomedOutTitleBar = me.zoomedOutTitleBar; me.addItem(me, me.frame, '0 0 0', '1 1 0', 1); if not(me.titleFontSize) diff --git a/data/qcsrc/menu-div0test/nexuiz/dialog.c b/data/qcsrc/menu-div0test/nexuiz/dialog.c index 1cf9ff883..2323b1691 100644 --- a/data/qcsrc/menu-div0test/nexuiz/dialog.c +++ b/data/qcsrc/menu-div0test/nexuiz/dialog.c @@ -22,6 +22,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) + ATTRIB(NexuizDialog, zoomedOutTitleBar, float, SKINHEIGHT_ZOOMEDTITLE != 0) ENDCLASS(NexuizDialog) #endif -- 2.39.2