Do not show any tooltip when the cursor is in a empty area in Settings - Game - Model...

diff --git a/qcsrc/menu/xonotic/dialog_settings_game.qc b/qcsrc/menu/xonotic/dialog_settings_game.qc
index 32d29d7dc7ce79a6b35d97e261ae208b53ead1aa..d2ce368d1d0b225452230bfef96ff4770f540890 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_game.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_game.qc
@@ -13,7 +13,7 @@ METHOD(SettingSource, getEntryTooltip, entity(entity this, int i, void(string th
 {
     Lazy l = Settings_from(i);
     entity it = l.m_get();
-    if (returns) returns(it.tooltip);
+    if (returns) returns(it.titleTooltip);
     return it;
 }
 METHOD(SettingSource, reload, int(entity this, string filter)) { return Settings_COUNT; }

diff --git a/qcsrc/menu/xonotic/dialog_settings_game_model.qh b/qcsrc/menu/xonotic/dialog_settings_game_model.qh
index 8ca179d36ad89990b9edd1b2db1e8d78f36a8f64..8dd6eaecb321cbb50f490e9de0c7b25d6c4f0ada 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_game_model.qh
+++ b/qcsrc/menu/xonotic/dialog_settings_game_model.qh
@@ -5,7 +5,7 @@ CLASS(XonoticGameModelSettingsTab, XonoticTab)
        METHOD(XonoticGameModelSettingsTab, fill, void(entity));
        METHOD(XonoticGameModelSettingsTab, showNotify, void(entity));
        ATTRIB(XonoticGameModelSettingsTab, title, string, _("Models"))
-       ATTRIB(XonoticGameModelSettingsTab, tooltip, string, _("Customize how players and items are displayed in game"))
+       ATTRIB(XonoticGameModelSettingsTab, titleTooltip, string, _("Customize how players and items are displayed in game"))
        ATTRIB(XonoticGameModelSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticGameModelSettingsTab, rows, float, 15.5)
        ATTRIB(XonoticGameModelSettingsTab, columns, float, 5)

diff --git a/qcsrc/menu/xonotic/tab.qh b/qcsrc/menu/xonotic/tab.qh
index 26fe898bbb2d6d05502d4dcd088aee7deea7f8db..b296d2491846c5f27ca20b45847397d631699b6f 100644 (file)
--- a/qcsrc/menu/xonotic/tab.qh
+++ b/qcsrc/menu/xonotic/tab.qh
@@ -19,4 +19,9 @@ CLASS(XonoticTab, Tab)
        ATTRIB(XonoticTab, rowHeight, float, SKINFONTSIZE_NORMAL * SKINHEIGHT_NORMAL) // pixels
 
        ATTRIB(XonoticTab, backgroundImage, string, string_null)
+
+       // 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, string_null)
 ENDCLASS(XonoticTab)