Skip to content

Commit

Permalink
Add setting for tooltips show delay.
Browse files Browse the repository at this point in the history
  • Loading branch information
RealBadAngel committed Jun 25, 2014
1 parent 27538ec commit 09ba047
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 1 deletion.
2 changes: 2 additions & 0 deletions minetest.conf.example
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,8 @@
#repeat_rightclick_time = 0.25
# Make fog and sky colors depend on daytime (dawn/sunset) and view direction
#directional_colored_fog = true
#tooltip_show_delay = 400
# Delay showing tooltips, in miliseconds

# Default timeout for cURL, in milliseconds
# Only has an effect if compiled with cURL
Expand Down
1 change: 1 addition & 0 deletions src/defaultsettings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ void set_default_settings(Settings *settings)
settings->setDefault("doubletap_jump", "false");
settings->setDefault("always_fly_fast", "true");
settings->setDefault("directional_colored_fog", "true");
settings->setDefault("tooltip_show_delay", "400");

// Some (temporary) keys for debugging
settings->setDefault("keymap_print_debug_stacks", "KEY_KEY_P");
Expand Down
4 changes: 3 additions & 1 deletion src/guiFormSpecMenu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ GUIFormSpecMenu::GUIFormSpecMenu(irr::IrrlichtDevice* dev,
m_doubleclickdetect[0].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;
assert(m_btn_height > 0);
}
Expand Down Expand Up @@ -2136,7 +2138,7 @@ void GUIFormSpecMenu::drawMenu()
m_old_tooltip_id = id;
} else if (id == m_old_tooltip_id) {
u32 delta = porting::getDeltaMs(m_hoovered_time, getTimeMs());
if (delta <= 400)
if (delta <= m_tooltip_show_delay)
goto skip_tooltip;
for(std::vector<FieldSpec>::iterator iter = m_fields.begin();
iter != m_fields.end(); iter++) {
Expand Down
1 change: 1 addition & 0 deletions src/guiFormSpecMenu.h
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,7 @@ class GUIFormSpecMenu : public GUIModalMenu
v2s32 m_pointer;
gui::IGUIStaticText *m_tooltip_element;

u32 m_tooltip_show_delay;
s32 m_hoovered_time;
s32 m_old_tooltip_id;
std::string m_old_tooltip;
Expand Down

0 comments on commit 09ba047

Please sign in to comment.