diff options
| author | DTA7 <dta7e@t-online.de> | 2017-09-15 14:31:32 +0200 |
|---|---|---|
| committer | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-09-15 14:31:32 +0200 |
| commit | 808ada11db2877576641380b9406756e347ce7f1 (patch) | |
| tree | 5c3bc8463e5c169ce36f577e7effcdebd9c0dfca /src | |
| parent | 04839f233f37faa9af406ea66fc6c199127781eb (diff) | |
| download | minetest-808ada11db2877576641380b9406756e347ce7f1.tar.gz minetest-808ada11db2877576641380b9406756e347ce7f1.tar.bz2 minetest-808ada11db2877576641380b9406756e347ce7f1.zip | |
Add setting to display the itemstring after the tooltip in the inventory. (#6413)
* Add setting to display the itemstring after the tooltip in the inventory.
Diffstat (limited to 'src')
| -rw-r--r-- | src/defaultsettings.cpp | 10 | ||||
| -rw-r--r-- | src/guiFormSpecMenu.cpp | 11 | ||||
| -rw-r--r-- | src/guiFormSpecMenu.h | 1 |
3 files changed, 10 insertions, 12 deletions
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 5e4cf526c..5f3c97e9d 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -123,15 +123,6 @@ void set_default_settings(Settings *settings) settings->setDefault("keymap_slot21", ""); settings->setDefault("keymap_slot22", ""); settings->setDefault("keymap_slot23", ""); - settings->setDefault("enable_build_where_you_stand", "false" ); - settings->setDefault("3d_mode", "none"); - settings->setDefault("3d_paralax_strength", "0.025"); - settings->setDefault("aux1_descends", "false"); - settings->setDefault("doubletap_jump", "false"); - settings->setDefault("always_fly_fast", "true"); - settings->setDefault("directional_colored_fog", "true"); - settings->setDefault("tooltip_show_delay", "400"); - settings->setDefault("zoom_fov", "15"); // Some (temporary) keys for debugging settings->setDefault("keymap_quicktune_prev", "KEY_HOME"); @@ -152,6 +143,7 @@ void set_default_settings(Settings *settings) settings->setDefault("3d_mode", "none"); settings->setDefault("3d_paralax_strength", "0.025"); settings->setDefault("tooltip_show_delay", "400"); + settings->setDefault("tooltip_append_itemstring", "false"); settings->setDefault("zoom_fov", "15"); settings->setDefault("fps_max", "60"); settings->setDefault("pause_fps_max", "20"); diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp index 7b7bd7c29..ef2637400 100644 --- a/src/guiFormSpecMenu.cpp +++ b/src/guiFormSpecMenu.cpp @@ -112,6 +112,7 @@ GUIFormSpecMenu::GUIFormSpecMenu(JoystickController *joystick, m_doubleclickdetect[1].pos = v2s32(0, 0); m_tooltip_show_delay = (u32)g_settings->getS32("tooltip_show_delay"); + m_tooltip_append_itemstring = g_settings->getBool("tooltip_append_itemstring"); } GUIFormSpecMenu::~GUIFormSpecMenu() @@ -2388,9 +2389,13 @@ void GUIFormSpecMenu::drawList(const ListDrawSpec &s, int phase, utf8_to_wide(item.getDefinition(m_client->idef()).description); else tooltip_text = utf8_to_wide(desc); - // Show itemstring as fallback for easier debugging - if (!item.name.empty() && tooltip_text.empty()) - tooltip_text = utf8_to_wide(item.name); + + if (!item.name.empty()) { + if (tooltip_text.empty()) + tooltip_text = utf8_to_wide(item.name); + if (m_tooltip_append_itemstring) + tooltip_text += utf8_to_wide(" [" + item.name + "]"); + } } if (!tooltip_text.empty()) { showTooltip(tooltip_text, m_default_tooltip_color, diff --git a/src/guiFormSpecMenu.h b/src/guiFormSpecMenu.h index c86d596b7..902f86ce1 100644 --- a/src/guiFormSpecMenu.h +++ b/src/guiFormSpecMenu.h @@ -407,6 +407,7 @@ protected: gui::IGUIStaticText *m_tooltip_element = nullptr; u64 m_tooltip_show_delay; + bool m_tooltip_append_itemstring; u64 m_hovered_time = 0; s32 m_old_tooltip_id = -1; |