moparisthebest/minetest
1
0
Fork 0
mirror of https://github.com/moparisthebest/minetest synced 2024-11-15 22:05:07 -05:00
Code Issues Releases Wiki Activity

Add setting for tooltips show delay.

Browse Source
This commit is contained in:
RealBadAngel 2014-06-25 11:52:09 +02:00
parent 27538ecef5
commit 09ba047c01
4 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
minetest.conf.example
View File

@ -200,6 +200,8 @@
#repeat_rightclick_time = 0.25 #repeat_rightclick_time = 0.25
# Make fog and sky colors depend on daytime (dawn/sunset) and view direction # Make fog and sky colors depend on daytime (dawn/sunset) and view direction
#directional_colored_fog = true #directional_colored_fog = true
#tooltip_show_delay = 400
# Delay showing tooltips, in miliseconds
# Default timeout for cURL, in milliseconds # Default timeout for cURL, in milliseconds
# Only has an effect if compiled with cURL # Only has an effect if compiled with cURL

1
src/defaultsettings.cpp
View File

@ -64,6 +64,7 @@ void set_default_settings(Settings *settings)
settings->setDefault("doubletap_jump", "false"); settings->setDefault("doubletap_jump", "false");
settings->setDefault("always_fly_fast", "true"); settings->setDefault("always_fly_fast", "true");
settings->setDefault("directional_colored_fog", "true"); settings->setDefault("directional_colored_fog", "true");
settings->setDefault("tooltip_show_delay", "400");
// Some (temporary) keys for debugging // Some (temporary) keys for debugging
settings->setDefault("keymap_print_debug_stacks", "KEY_KEY_P"); settings->setDefault("keymap_print_debug_stacks", "KEY_KEY_P");

4
src/guiFormSpecMenu.cpp
View File

@ -99,6 +99,8 @@ GUIFormSpecMenu::GUIFormSpecMenu(irr::IrrlichtDevice* dev,
m_doubleclickdetect[0].pos = v2s32(0, 0); m_doubleclickdetect[0].pos = v2s32(0, 0);
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_btn_height = g_settings->getS32("font_size") +2; m_btn_height = g_settings->getS32("font_size") +2;
assert(m_btn_height > 0); assert(m_btn_height > 0);
} }
@ -2136,7 +2138,7 @@ void GUIFormSpecMenu::drawMenu()
m_old_tooltip_id = id; m_old_tooltip_id = id;
} else if (id == m_old_tooltip_id) { } else if (id == m_old_tooltip_id) {
u32 delta = porting::getDeltaMs(m_hoovered_time, getTimeMs()); u32 delta = porting::getDeltaMs(m_hoovered_time, getTimeMs());
if (delta <= 400) if (delta <= m_tooltip_show_delay)
goto skip_tooltip; goto skip_tooltip;
for(std::vector<FieldSpec>::iterator iter = m_fields.begin(); for(std::vector<FieldSpec>::iterator iter = m_fields.begin();
iter != m_fields.end(); iter++) { iter != m_fields.end(); iter++) {

1
src/guiFormSpecMenu.h
View File

@ -315,6 +315,7 @@ protected:
v2s32 m_pointer; v2s32 m_pointer;
gui::IGUIStaticText *m_tooltip_element; gui::IGUIStaticText *m_tooltip_element;
u32 m_tooltip_show_delay;
s32 m_hoovered_time; s32 m_hoovered_time;
s32 m_old_tooltip_id; s32 m_old_tooltip_id;
std::string m_old_tooltip; std::string m_old_tooltip;