From: terencehill <piuntn@gmail.com>
Date: Wed, 2 Sep 2015 12:26:14 +0000 (+0200)
Subject: Allow to display tooltips in XonoticRegisteredSettingsList, add tooltip for "Models"
X-Git-Tag: xonotic-v0.8.2~1808^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=863532534585ebbb912e7509c17245c52e9e85f1;p=xonotic%2Fxonotic-data.pk3dir.git

Allow to display tooltips in XonoticRegisteredSettingsList, add tooltip for "Models"
---

diff --git a/qcsrc/menu/xonotic/dialog_settings_game.qc b/qcsrc/menu/xonotic/dialog_settings_game.qc
index 497e1e5e7..cde5d40a6 100644
--- a/qcsrc/menu/xonotic/dialog_settings_game.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_game.qc
@@ -12,6 +12,13 @@ CLASS(SettingSource, DataSource)
         if (returns) returns(it.title, string_null);
         return it;
     }
+    METHOD(SettingSource, getEntryTooltip, entity(int i, void(string theTooltip) returns))
+    {
+        Lazy l = SETTINGS[i];
+        entity it = l.m_get();
+        if (returns) returns(it.tooltip);
+        return it;
+    }
     METHOD(SettingSource, reload, int(string filter)) { return SETTINGS_COUNT; }
 ENDCLASS(SettingSource)
 
@@ -30,15 +37,23 @@ CLASS(XonoticRegisteredSettingsList, XonoticListBox)
     ATTRIB(XonoticRegisteredSettingsList, source, DataSource, NULL)
 	ATTRIB(XonoticRegisteredSettingsList, onChange, void(entity, entity), func_null)
 	ATTRIB(XonoticRegisteredSettingsList, onChangeEntity, entity, NULL)
+	METHOD(XonoticRegisteredSettingsList, focusedItemChangeNotify, void(entity));
+
 	string XonoticRegisteredSettingsList_cb_name;
-	void XonoticRegisteredSettingsList_cb(string _name, string _icon)
+	string XonoticRegisteredSettingsList_cb_tooltip;
+	void XonoticRegisteredSettingsList_getNameIcon_cb(string _name, string _icon)
 	{
 		XonoticRegisteredSettingsList_cb_name = _name;
 	}
+	void XonoticRegisteredSettingsList_getTooltip_cb(string _tooltip)
+	{
+		XonoticRegisteredSettingsList_cb_tooltip = _tooltip;
+	}
+
 	METHOD(XonoticRegisteredSettingsList, drawListBoxItem, void(entity this, int i, vector absSize, bool isSelected, bool isFocused))
 	{
 		if (!this.source) return;
-		if (!this.source.getEntry(i, XonoticRegisteredSettingsList_cb)) return;
+		if (!this.source.getEntry(i, XonoticRegisteredSettingsList_getNameIcon_cb)) return;
 		string name = XonoticRegisteredSettingsList_cb_name;
 		if (isSelected) {
 			draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_SELECTED, SKINALPHA_LISTBOX_SELECTED);
@@ -49,6 +64,26 @@ CLASS(XonoticRegisteredSettingsList, XonoticListBox)
 		string s = draw_TextShortenToWidth(strdecolorize(name), 1, 0, this.realFontSize);
 		draw_Text(this.realUpperMargin * eY + (0.5 * this.realFontSize.x) * eX, s, this.realFontSize, '1 1 1', SKINALPHA_TEXT, 0);
 	}
+
+	METHOD(XonoticRegisteredSettingsList, focusedItemChangeNotify, void(entity this))
+	{
+		if (this.focusedItem == -1 || !this.source)
+		{
+			clearTooltip(this);
+			return;
+		}
+		if (!this.source.getEntryTooltip(this.focusedItem, XonoticRegisteredSettingsList_getTooltip_cb))
+		{
+			clearTooltip(this);
+			return;
+		}
+		string theTooltip = XonoticRegisteredSettingsList_cb_tooltip;
+		if(theTooltip != "")
+			setZonedTooltip(this, theTooltip, string_null);
+		else
+			clearTooltip(this);
+	}
+
 	METHOD(XonoticRegisteredSettingsList, refilter, void(entity this))
 	{
 		if (!this.source) {
diff --git a/qcsrc/menu/xonotic/dialog_settings_game_model.qc b/qcsrc/menu/xonotic/dialog_settings_game_model.qc
index 17dbdee08..6e2779bad 100644
--- a/qcsrc/menu/xonotic/dialog_settings_game_model.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_game_model.qc
@@ -5,6 +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, intendedWidth, float, 0.9)
 	ATTRIB(XonoticGameModelSettingsTab, rows, float, 13)
 	ATTRIB(XonoticGameModelSettingsTab, columns, float, 5)