From: RealBadAngel <maciej.kasatkin@o2.pl>
Date: Wed, 25 Jun 2014 09:52:09 +0000 (+0200)
Subject: Add setting for tooltips show delay.
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=09ba047c0175adfaca4a6bccc41c8a0570c295db;p=zefram%2Fminetest%2Fminetest_engine.git

Add setting for tooltips show delay.
---

diff --git a/minetest.conf.example b/minetest.conf.example
index 6d4186f8..a8d573d8 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -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
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index d0e56286..cc6a0dd6 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -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");
diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp
index 3ff0274f..2f4c2f5f 100644
--- a/src/guiFormSpecMenu.cpp
+++ b/src/guiFormSpecMenu.cpp
@@ -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);
 }
@@ -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++) {
diff --git a/src/guiFormSpecMenu.h b/src/guiFormSpecMenu.h
index da082668..3368bb82 100644
--- a/src/guiFormSpecMenu.h
+++ b/src/guiFormSpecMenu.h
@@ -315,6 +315,7 @@ protected:
 	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;