Merge remote-tracking branch 'origin/master' into terencehill/menu_remove_tab_title

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / item / tab.qc

diff --git a/qcsrc/menu/item/tab.qc b/qcsrc/menu/item/tab.qc
index 3fdcccc6896c52a71267f7a4fdb9abc7684213dc..e5f263e45974eea22c4f98c6e482e17d143feede 100644 (file)
--- a/qcsrc/menu/item/tab.qc
+++ b/qcsrc/menu/item/tab.qc
@@ -1,11 +1,10 @@
 #ifndef ITEM_TAB_H
 #define ITEM_TAB_H
 #ifndef ITEM_TAB_H
 #define ITEM_TAB_H

+#include "dialog.qc"

 CLASS(Tab, Dialog)
        ATTRIB(Tab, isTabRoot, float, 0)
        ATTRIB(Tab, closable, float, 0)
        ATTRIB(Tab, rootDialog, float, 0)
 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)
 
        // still to be customized
        ATTRIB(Tab, intendedWidth, float, 0)


@@ -19,7 +18,6 @@ CLASS(Tab, Dialog)
        ATTRIB(Tab, columnSpacing, float, 0) // pixels
        ATTRIB(Tab, rowSpacing, float, 0) // pixels
        ATTRIB(Tab, rowHeight, float, 0) // pixels
        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)
 
        ATTRIB(Tab, backgroundImage, string, string_null)
 ENDCLASS(Tab)