MoNTE48
/
Minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct tooltip_append_itemstring terminology (#6421)

master
DTA7 2017-09-16 18:42:17 +02:00 committed by SmallJoker
parent 45a7dd1ec4
commit 45e9f80811
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/settingtypes.txt
View File

@ -710,8 +710,8 @@ gui_scaling_filter_txr2img (GUI scaling filter txr2img) bool true
# Delay showing tooltips, stated in milliseconds. # Delay showing tooltips, stated in milliseconds.
tooltip_show_delay (Tooltip delay) int 400 tooltip_show_delay (Tooltip delay) int 400
# Append itemstring to tooltip # Append item name to tooltip.
tooltip_append_itemstring (Append itemstring) bool false tooltip_append_itemname (Append item name) bool false
# Whether freetype fonts are used, requires freetype support to be compiled in. # Whether freetype fonts are used, requires freetype support to be compiled in.
freetype (Freetype fonts) bool true freetype (Freetype fonts) bool true

2
src/defaultsettings.cpp
View File

@ -143,7 +143,7 @@ void set_default_settings(Settings *settings)
settings->setDefault("3d_mode", "none"); settings->setDefault("3d_mode", "none");
settings->setDefault("3d_paralax_strength", "0.025"); settings->setDefault("3d_paralax_strength", "0.025");
settings->setDefault("tooltip_show_delay", "400"); settings->setDefault("tooltip_show_delay", "400");
settings->setDefault("tooltip_append_itemstring", "false"); settings->setDefault("tooltip_append_itemname", "false");
settings->setDefault("zoom_fov", "15"); settings->setDefault("zoom_fov", "15");
settings->setDefault("fps_max", "60"); settings->setDefault("fps_max", "60");
settings->setDefault("pause_fps_max", "20"); settings->setDefault("pause_fps_max", "20");

4
src/guiFormSpecMenu.cpp
View File

@ -112,7 +112,7 @@ GUIFormSpecMenu::GUIFormSpecMenu(JoystickController *joystick,
m_doubleclickdetect[1].pos = v2s32(0, 0); m_doubleclickdetect[1].pos = v2s32(0, 0);
m_tooltip_show_delay = (u32)g_settings->getS32("tooltip_show_delay"); m_tooltip_show_delay = (u32)g_settings->getS32("tooltip_show_delay");
m_tooltip_append_itemstring = g_settings->getBool("tooltip_append_itemstring"); m_tooltip_append_itemname = g_settings->getBool("tooltip_append_itemname");
} }
GUIFormSpecMenu::~GUIFormSpecMenu() GUIFormSpecMenu::~GUIFormSpecMenu()
@ -2393,7 +2393,7 @@ void GUIFormSpecMenu::drawList(const ListDrawSpec &s, int phase,
if (!item.name.empty()) { if (!item.name.empty()) {
if (tooltip_text.empty()) if (tooltip_text.empty())
tooltip_text = utf8_to_wide(item.name); tooltip_text = utf8_to_wide(item.name);
if (m_tooltip_append_itemstring) if (m_tooltip_append_itemname)
tooltip_text += utf8_to_wide(" [" + item.name + "]"); tooltip_text += utf8_to_wide(" [" + item.name + "]");
} }
} }

2
src/guiFormSpecMenu.h
View File

@ -407,7 +407,7 @@ protected:
gui::IGUIStaticText *m_tooltip_element = nullptr; gui::IGUIStaticText *m_tooltip_element = nullptr;
u64 m_tooltip_show_delay; u64 m_tooltip_show_delay;
bool m_tooltip_append_itemstring; bool m_tooltip_append_itemname;
u64 m_hovered_time = 0; u64 m_hovered_time = 0;
s32 m_old_tooltip_id = -1; s32 m_old_tooltip_id = -1;