mirror of
https://github.com/minetest/minetest.git
synced 2024-07-04 15:05:27 +02:00
Fix delay on bound supertips
This commit is contained in:
parent
bab7187a23
commit
0f12a322d9
@ -1770,6 +1770,35 @@ void GUIFormSpecMenu::parseSuperTip(parserData *data, const std::string &element
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::vector<std::string> v_stpos;
|
||||||
|
bool floating = true;
|
||||||
|
size_t i = rect_mode ? 2 : 1;
|
||||||
|
|
||||||
|
if (parts[i] != "") {
|
||||||
|
v_stpos = split(parts[i], ',');
|
||||||
|
if (v_stpos.size() != i) {
|
||||||
|
errorstream << "Invalid staticPos in supertip element(" << parts.size() <<
|
||||||
|
"): \"" << parts[2] << "\"" << std::endl;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
floating = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string name = parts[rect_mode ? 4 : 3];
|
||||||
|
std::string text = parts[rect_mode ? 5 : 4];
|
||||||
|
|
||||||
|
if (m_form_src)
|
||||||
|
text = m_form_src->resolveText(text);
|
||||||
|
|
||||||
|
FieldSpec spec(
|
||||||
|
name,
|
||||||
|
translate_string(utf8_to_wide(unescape_string(text))),
|
||||||
|
L"",
|
||||||
|
258 + m_fields.size()
|
||||||
|
);
|
||||||
|
|
||||||
|
m_fields.push_back(spec);
|
||||||
|
|
||||||
if (rect_mode) {
|
if (rect_mode) {
|
||||||
std::vector<std::string> v_pos = split(parts[0], ',');
|
std::vector<std::string> v_pos = split(parts[0], ',');
|
||||||
std::vector<std::string> v_geom = split(parts[1], ',');
|
std::vector<std::string> v_geom = split(parts[1], ',');
|
||||||
@ -1777,22 +1806,7 @@ void GUIFormSpecMenu::parseSuperTip(parserData *data, const std::string &element
|
|||||||
MY_CHECKPOS("supertip", 0);
|
MY_CHECKPOS("supertip", 0);
|
||||||
MY_CHECKGEOM("supertip", 1);
|
MY_CHECKGEOM("supertip", 1);
|
||||||
|
|
||||||
std::vector<std::string> v_stpos;
|
|
||||||
bool floating = true;
|
|
||||||
if(parts[2] != "") {
|
|
||||||
v_stpos = split(parts[2], ',');
|
|
||||||
if (v_stpos.size() != 2) {
|
|
||||||
errorstream << "Invalid staticPos in supertip element(" << parts.size() <<
|
|
||||||
"): \"" << parts[2] << "\"" << std::endl;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
floating = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
s32 width = stof(parts[3]) * spacing.Y;
|
s32 width = stof(parts[3]) * spacing.Y;
|
||||||
std::string name = parts[4];
|
|
||||||
std::string text = parts[5];
|
|
||||||
|
|
||||||
v2s32 pos;
|
v2s32 pos;
|
||||||
v2s32 geom;
|
v2s32 geom;
|
||||||
v2s32 stpos;
|
v2s32 stpos;
|
||||||
@ -1814,25 +1828,14 @@ void GUIFormSpecMenu::parseSuperTip(parserData *data, const std::string &element
|
|||||||
|
|
||||||
core::rect<s32> rect(pos, pos + geom);
|
core::rect<s32> rect(pos, pos + geom);
|
||||||
|
|
||||||
if (m_form_src)
|
|
||||||
text = m_form_src->resolveText(text);
|
|
||||||
|
|
||||||
FieldSpec spec(
|
|
||||||
name,
|
|
||||||
translate_string(utf8_to_wide(unescape_string(text))),
|
|
||||||
L"",
|
|
||||||
258 + m_fields.size()
|
|
||||||
);
|
|
||||||
|
|
||||||
GUIHyperText *e = new GUIHyperText(spec.flabel.c_str(), Environment,
|
GUIHyperText *e = new GUIHyperText(spec.flabel.c_str(), Environment,
|
||||||
data->current_parent, spec.fid, rect, m_client, m_tsrc);
|
data->current_parent, spec.fid, rect, m_client, m_tsrc);
|
||||||
|
|
||||||
auto style = getStyleForElement("supertip", spec.fname);
|
auto style = getStyleForElement("supertip", spec.fname);
|
||||||
e->setStyles(style);
|
e->setStyles(style);
|
||||||
|
|
||||||
SuperTipSpec geospec(name, text, e->getAbsoluteClippingRect(), stpos, width, floating);
|
SuperTipSpec geospec(name, "", text, e->getAbsoluteClippingRect(), stpos, width, floating);
|
||||||
|
|
||||||
m_fields.push_back(spec);
|
|
||||||
m_supertips.emplace_back(e, geospec);
|
m_supertips.emplace_back(e, geospec);
|
||||||
|
|
||||||
e->setVisible(false);
|
e->setVisible(false);
|
||||||
@ -1849,18 +1852,6 @@ void GUIFormSpecMenu::parseSuperTip(parserData *data, const std::string &element
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
std::vector<std::string> v_stpos;
|
|
||||||
bool floating = true;
|
|
||||||
if(parts[1] != "") {
|
|
||||||
v_stpos = split(parts[1], ',');
|
|
||||||
if (v_stpos.size() != 2) {
|
|
||||||
errorstream << "Invalid staticPos in supertip element(" << parts.size() <<
|
|
||||||
"): \"" << parts[2] << "\"" << std::endl;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
floating = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
s32 width = stof(parts[2]) * spacing.Y;
|
s32 width = stof(parts[2]) * spacing.Y;
|
||||||
v2s32 stpos;
|
v2s32 stpos;
|
||||||
|
|
||||||
@ -1871,21 +1862,7 @@ void GUIFormSpecMenu::parseSuperTip(parserData *data, const std::string &element
|
|||||||
stpos = getElementBasePos(&v_stpos);
|
stpos = getElementBasePos(&v_stpos);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string name = parts[3];
|
m_supertip_map[fieldname] = SuperTipSpec(name, fieldname, text, rect, stpos, width, floating);
|
||||||
std::string text = parts[4];
|
|
||||||
|
|
||||||
if (m_form_src)
|
|
||||||
text = m_form_src->resolveText(text);
|
|
||||||
|
|
||||||
FieldSpec spec(
|
|
||||||
name,
|
|
||||||
translate_string(utf8_to_wide(unescape_string(text))),
|
|
||||||
L"",
|
|
||||||
258 + m_fields.size()
|
|
||||||
);
|
|
||||||
|
|
||||||
m_fields.push_back(spec);
|
|
||||||
m_supertip_map[fieldname] = SuperTipSpec(name, text, rect, stpos, width, floating);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -3781,17 +3758,15 @@ void GUIFormSpecMenu::drawMenu()
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Draw supertip
|
Draw rect_mode supertip
|
||||||
*/
|
*/
|
||||||
for (auto &pair : m_supertips) {
|
for (const auto &pair : m_supertips) {
|
||||||
auto &spec = pair.second;
|
if (m_supertip_map.count(pair.second.parent_name) == 0) {
|
||||||
const auto &hover_rect = spec.hover_rect;
|
const auto &hover_rect = pair.second.hover_rect;
|
||||||
|
if (hover_rect.getArea() > 0 && hover_rect.isPointInside(m_pointer)) {
|
||||||
if (hover_rect.getArea() > 0 && hover_rect.isPointInside(m_pointer))
|
showSuperTip(pair.first, pair.second);
|
||||||
showSuperTip(pair.first, spec);
|
break;
|
||||||
else {
|
}
|
||||||
pair.first->setVisible(false);
|
|
||||||
spec.bound = false;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -3824,6 +3799,10 @@ void GUIFormSpecMenu::drawMenu()
|
|||||||
NULL, m_client, IT_ROT_HOVERED);
|
NULL, m_client, IT_ROT_HOVERED);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for (const auto &pair : m_supertips)
|
||||||
|
if (pair.first->isVisible())
|
||||||
|
pair.first->setVisible(false);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Draw fields/buttons tooltips and update the mouse cursor
|
Draw fields/buttons tooltips and update the mouse cursor
|
||||||
*/
|
*/
|
||||||
@ -3874,11 +3853,11 @@ void GUIFormSpecMenu::drawMenu()
|
|||||||
|
|
||||||
if (delta >= m_tooltip_show_delay) {
|
if (delta >= m_tooltip_show_delay) {
|
||||||
const std::wstring &text = m_tooltips[field.fname].tooltip;
|
const std::wstring &text = m_tooltips[field.fname].tooltip;
|
||||||
if (!text.empty())
|
if (!text.empty()) {
|
||||||
|
/* Tooltips get the priority over supertips */
|
||||||
showTooltip(text, m_tooltips[field.fname].color,
|
showTooltip(text, m_tooltips[field.fname].color,
|
||||||
m_tooltips[field.fname].bgcolor);
|
m_tooltips[field.fname].bgcolor);
|
||||||
|
} else if (m_supertip_map.count(field.fname) != 0) {
|
||||||
if (m_supertip_map.count(field.fname) != 0) {
|
|
||||||
auto &spec = m_supertip_map[field.fname];
|
auto &spec = m_supertip_map[field.fname];
|
||||||
|
|
||||||
if (!spec.bound) {
|
if (!spec.bound) {
|
||||||
@ -3898,6 +3877,13 @@ void GUIFormSpecMenu::drawMenu()
|
|||||||
|
|
||||||
e->setVisible(false);
|
e->setVisible(false);
|
||||||
e->drop();
|
e->drop();
|
||||||
|
} else {
|
||||||
|
for (const auto &pair : m_supertips) {
|
||||||
|
if (field.fname == pair.second.parent_name) {
|
||||||
|
showSuperTip(pair.first, pair.second);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -169,10 +169,15 @@ class GUIFormSpecMenu : public GUIModalMenu
|
|||||||
struct SuperTipSpec
|
struct SuperTipSpec
|
||||||
{
|
{
|
||||||
SuperTipSpec() = default;
|
SuperTipSpec() = default;
|
||||||
SuperTipSpec(const std::string &a_name, const std::string &a_text,
|
SuperTipSpec(const std::string &a_name,
|
||||||
const core::rect<s32> &a_rect, v2s32 a_stpos, s32 a_width,
|
const std::string &a_parent_name,
|
||||||
|
const std::string &a_text,
|
||||||
|
const core::rect<s32> &a_rect,
|
||||||
|
v2s32 a_stpos,
|
||||||
|
s32 a_width,
|
||||||
bool a_floating) :
|
bool a_floating) :
|
||||||
name(a_name),
|
name(a_name),
|
||||||
|
parent_name(a_parent_name),
|
||||||
text(a_text),
|
text(a_text),
|
||||||
hover_rect(a_rect),
|
hover_rect(a_rect),
|
||||||
stpos(a_stpos),
|
stpos(a_stpos),
|
||||||
@ -182,6 +187,7 @@ class GUIFormSpecMenu : public GUIModalMenu
|
|||||||
}
|
}
|
||||||
|
|
||||||
std::string name;
|
std::string name;
|
||||||
|
std::string parent_name;
|
||||||
std::string text;
|
std::string text;
|
||||||
core::rect<s32> hover_rect;
|
core::rect<s32> hover_rect;
|
||||||
v2s32 stpos;
|
v2s32 stpos;
|
||||||
|
Loading…
Reference in New Issue
Block a user