Merge branch 'terencehill/menu_remove_tab_title' of git://de.git.xonotic.org/xonotic...

Conflicts:
	qcsrc/menu/item/dialog.qc

diff --git a/qcsrc/menu/item/dialog.qc b/qcsrc/menu/item/dialog.qc
index b6048ac682219d7958cf2f3699e599ba634b0c13..77037ace61132e48fc3bf57e87f24fc7e249756a 100644 (file)
--- a/qcsrc/menu/item/dialog.qc
+++ b/qcsrc/menu/item/dialog.qc
@@ -130,12 +130,15 @@ void Dialog_configureDialog(entity me)
 {
        float absWidth, absHeight;
 
-       me.frame = NEW(BorderImage);
-       me.frame.configureBorderImage(me.frame, me.title, me.titleFontSize, me.color, me.backgroundImage, me.borderLines * me.titleHeight);
-       me.frame.zoomedOutTitleBarPosition = me.zoomedOutTitleBarPosition;
-       me.frame.zoomedOutTitleBar = me.zoomedOutTitleBar;
-       me.frame.alpha = me.alpha;
-       me.addItem(me, me.frame, '0 0 0', '1 1 0', 1);
+       if(me.isTabRoot)
+       {
+               me.frame = NEW(BorderImage);
+               me.frame.configureBorderImage(me.frame, me.title, me.titleFontSize, me.color, me.backgroundImage, me.borderLines * me.titleHeight);
+               me.frame.zoomedOutTitleBarPosition = me.zoomedOutTitleBarPosition;
+               me.frame.zoomedOutTitleBar = me.zoomedOutTitleBar;
+               me.frame.alpha = me.alpha;
+               me.addItem(me, me.frame, '0 0 0', '1 1 0', 1);
+       }
 
        if (!me.titleFontSize)
                me.titleHeight = 0; // no title bar
@@ -155,7 +158,7 @@ void Dialog_configureDialog(entity me)
 
        me.fill(me);
 
-       if(me.closable && me.borderLines > 0)
+       if(me.isTabRoot && me.closable && me.borderLines > 0)
        {
                entity closebutton;
                closebutton = me.closeButton = me.frame.closeButton = NEW(Button);

diff --git a/qcsrc/menu/item/tab.qc b/qcsrc/menu/item/tab.qc
index e5f263e45974eea22c4f98c6e482e17d143feede..fbbf77668750c26a27b5e1b1e018e0805d0cb822 100644 (file)
--- a/qcsrc/menu/item/tab.qc
+++ b/qcsrc/menu/item/tab.qc
@@ -5,6 +5,8 @@ CLASS(Tab, Dialog)
        ATTRIB(Tab, isTabRoot, float, 0)
        ATTRIB(Tab, closable, float, 0)
        ATTRIB(Tab, rootDialog, float, 0)
+       ATTRIB(Tab, title, string, string_null)
+       ATTRIB(Tab, titleFontSize, float, 0) // pixels
 
        // still to be customized
        ATTRIB(Tab, intendedWidth, float, 0)
@@ -18,6 +20,7 @@ CLASS(Tab, Dialog)
        ATTRIB(Tab, columnSpacing, float, 0) // pixels
        ATTRIB(Tab, rowSpacing, float, 0) // pixels
        ATTRIB(Tab, rowHeight, float, 0) // pixels
+       ATTRIB(Tab, titleHeight, float, 0) // pixels
 
        ATTRIB(Tab, backgroundImage, string, string_null)
 ENDCLASS(Tab)