Skip to content

Commit

Permalink
Fix delay on bound supertips
Browse files Browse the repository at this point in the history
  • Loading branch information
@kilbith @Wuzzy2
kilbith authored and Wuzzy2 committed Jun 21, 2024
1 parent bab7187 commit 0f12a32
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 69 deletions.
120 changes: 53 additions & 67 deletions src/gui/guiFormSpecMenu.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1770,29 +1770,43 @@ void GUIFormSpecMenu::parseSuperTip(parserData *data, const std::string &element
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) {
std::vector<std::string> v_pos = split(parts[0], ',');
std::vector<std::string> v_geom = split(parts[1], ',');

MY_CHECKPOS("supertip", 0);
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;
std::string name = parts[4];
std::string text = parts[5];

v2s32 pos;
v2s32 geom;
v2s32 stpos;
Expand All @@ -1814,25 +1828,14 @@ void GUIFormSpecMenu::parseSuperTip(parserData *data, const std::string &element

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,
data->current_parent, spec.fid, rect, m_client, m_tsrc);

auto style = getStyleForElement("supertip", spec.fname);
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);

e->setVisible(false);
Expand All @@ -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;
v2s32 stpos;

Expand All @@ -1871,21 +1862,7 @@ void GUIFormSpecMenu::parseSuperTip(parserData *data, const std::string &element
stpos = getElementBasePos(&v_stpos);
}

std::string name = parts[3];
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);
m_supertip_map[fieldname] = SuperTipSpec(name, fieldname, text, rect, stpos, width, floating);
}
}

Expand Down Expand Up @@ -3781,17 +3758,15 @@ void GUIFormSpecMenu::drawMenu()
}

/*
Draw supertip
Draw rect_mode supertip
*/
for (auto &pair : m_supertips) {
auto &spec = pair.second;
const auto &hover_rect = spec.hover_rect;

if (hover_rect.getArea() > 0 && hover_rect.isPointInside(m_pointer))
showSuperTip(pair.first, spec);
else {
pair.first->setVisible(false);
spec.bound = false;
for (const auto &pair : m_supertips) {
if (m_supertip_map.count(pair.second.parent_name) == 0) {
const auto &hover_rect = pair.second.hover_rect;
if (hover_rect.getArea() > 0 && hover_rect.isPointInside(m_pointer)) {
showSuperTip(pair.first, pair.second);
break;
}
}
}

Expand Down Expand Up @@ -3824,6 +3799,10 @@ void GUIFormSpecMenu::drawMenu()
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
*/
Expand Down Expand Up @@ -3874,11 +3853,11 @@ void GUIFormSpecMenu::drawMenu()

if (delta >= m_tooltip_show_delay) {
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,
m_tooltips[field.fname].bgcolor);

if (m_supertip_map.count(field.fname) != 0) {
} else if (m_supertip_map.count(field.fname) != 0) {
auto &spec = m_supertip_map[field.fname];

if (!spec.bound) {
Expand All @@ -3898,6 +3877,13 @@ void GUIFormSpecMenu::drawMenu()

e->setVisible(false);
e->drop();
} else {
for (const auto &pair : m_supertips) {
if (field.fname == pair.second.parent_name) {
showSuperTip(pair.first, pair.second);
break;
}
}
}
}
}
Expand Down
10 changes: 8 additions & 2 deletions src/gui/guiFormSpecMenu.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,15 @@ class GUIFormSpecMenu : public GUIModalMenu
struct SuperTipSpec
{
SuperTipSpec() = default;
SuperTipSpec(const std::string &a_name, const std::string &a_text,
const core::rect<s32> &a_rect, v2s32 a_stpos, s32 a_width,
SuperTipSpec(const std::string &a_name,
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) :
name(a_name),
parent_name(a_parent_name),
text(a_text),
hover_rect(a_rect),
stpos(a_stpos),
Expand All @@ -182,6 +187,7 @@ class GUIFormSpecMenu : public GUIModalMenu
}

std::string name;
std::string parent_name;
std::string text;
core::rect<s32> hover_rect;
v2s32 stpos;
Expand Down

0 comments on commit 0f12a32

Please sign in to comment.