Merge branch 'master' into Lyberta/StandaloneOverkillWeapons

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

diff --git a/qcsrc/menu/xonotic/tab.qh b/qcsrc/menu/xonotic/tab.qh
index 26fe898bbb2d6d05502d4dcd088aee7deea7f8db..ff561d57e68d139dcb404e97270e4c6befc9e277 100644 (file)
--- a/qcsrc/menu/xonotic/tab.qh
+++ b/qcsrc/menu/xonotic/tab.qh
@@ -4,19 +4,24 @@
 CLASS(XonoticTab, Tab)
        // still to be customized by user
        /*
-       ATTRIB(XonoticTab, intendedWidth, float, 0)
-       ATTRIB(XonoticTab, rows, float, 3)
-       ATTRIB(XonoticTab, columns, float, 2)
+       ATTRIB(XonoticTab, intendedWidth, float, 0);
+       ATTRIB(XonoticTab, rows, float, 3);
+       ATTRIB(XonoticTab, columns, float, 2);
        */
        METHOD(XonoticTab, showNotify, void(entity));
 
-       ATTRIB(XonoticTab, marginTop, float, 0)                                       // pixels
-       ATTRIB(XonoticTab, marginBottom, float, 0)                                    // pixels
-       ATTRIB(XonoticTab, marginLeft, float, 0)                                      // pixels
-       ATTRIB(XonoticTab, marginRight, float, 0)                                     // pixels
-       ATTRIB(XonoticTab, columnSpacing, float, SKINMARGIN_COLUMNS)                  // pixels
-       ATTRIB(XonoticTab, rowSpacing, float, SKINMARGIN_ROWS)                        // pixels
-       ATTRIB(XonoticTab, rowHeight, float, SKINFONTSIZE_NORMAL * SKINHEIGHT_NORMAL) // pixels
+       ATTRIB(XonoticTab, marginTop, float, 0);                                       // pixels
+       ATTRIB(XonoticTab, marginBottom, float, 0);                                    // pixels
+       ATTRIB(XonoticTab, marginLeft, float, 0);                                      // pixels
+       ATTRIB(XonoticTab, marginRight, float, 0);                                     // pixels
+       ATTRIB(XonoticTab, columnSpacing, float, SKINMARGIN_COLUMNS);                  // pixels
+       ATTRIB(XonoticTab, rowSpacing, float, SKINMARGIN_ROWS);                        // pixels
+       ATTRIB(XonoticTab, rowHeight, float, SKINFONTSIZE_NORMAL * SKINHEIGHT_NORMAL); // pixels
 
-       ATTRIB(XonoticTab, backgroundImage, string, string_null)
+       ATTRIB(XonoticTab, backgroundImage, string);
+
+       // using "titleTooltip" instead of "tooltip" so that
+       // the tooltip search function doesn't find it
+       // .tooltip should be set only in the item displaying the tab title
+       ATTRIB(XonoticTab, titleTooltip, string);
 ENDCLASS(XonoticTab)